diff options
280 files changed, 6169 insertions, 3062 deletions
diff --git a/api/17.txt b/api/17.txt index 1a6657c556dc..e86de90ab46d 100644 --- a/api/17.txt +++ b/api/17.txt @@ -331,6 +331,7 @@ package android { field public static final int checkboxStyle = 16842860; // 0x101006c field public static final int checked = 16843014; // 0x1010106 field public static final int checkedButton = 16843080; // 0x1010148 + field public static final int checkedTextViewStyle = 16843720; // 0x10103c8 field public static final int childDivider = 16843025; // 0x1010111 field public static final int childIndicator = 16843020; // 0x101010c field public static final int childIndicatorLeft = 16843023; // 0x101010f @@ -1789,6 +1790,7 @@ package android { field public static final int Widget_DeviceDefault_Button_Small = 16974146; // 0x1030142 field public static final int Widget_DeviceDefault_Button_Toggle = 16974148; // 0x1030144 field public static final int Widget_DeviceDefault_CalendarView = 16974190; // 0x103016e + field public static final int Widget_DeviceDefault_CheckedTextView = 16974299; // 0x10301db field public static final int Widget_DeviceDefault_CompoundButton_CheckBox = 16974152; // 0x1030148 field public static final int Widget_DeviceDefault_CompoundButton_RadioButton = 16974169; // 0x1030159 field public static final int Widget_DeviceDefault_CompoundButton_Star = 16974173; // 0x103015d @@ -1822,6 +1824,7 @@ package android { field public static final int Widget_DeviceDefault_Light_Button_Small = 16974198; // 0x1030176 field public static final int Widget_DeviceDefault_Light_Button_Toggle = 16974200; // 0x1030178 field public static final int Widget_DeviceDefault_Light_CalendarView = 16974238; // 0x103019e + field public static final int Widget_DeviceDefault_Light_CheckedTextView = 16974300; // 0x10301dc field public static final int Widget_DeviceDefault_Light_CompoundButton_CheckBox = 16974204; // 0x103017c field public static final int Widget_DeviceDefault_Light_CompoundButton_RadioButton = 16974224; // 0x1030190 field public static final int Widget_DeviceDefault_Light_CompoundButton_Star = 16974228; // 0x1030194 @@ -1907,6 +1910,7 @@ package android { field public static final int Widget_Holo_Button_Small = 16973964; // 0x103008c field public static final int Widget_Holo_Button_Toggle = 16973966; // 0x103008e field public static final int Widget_Holo_CalendarView = 16974060; // 0x10300ec + field public static final int Widget_Holo_CheckedTextView = 16974297; // 0x10301d9 field public static final int Widget_Holo_CompoundButton_CheckBox = 16973969; // 0x1030091 field public static final int Widget_Holo_CompoundButton_RadioButton = 16973986; // 0x10300a2 field public static final int Widget_Holo_CompoundButton_Star = 16973990; // 0x10300a6 @@ -1940,6 +1944,7 @@ package android { field public static final int Widget_Holo_Light_Button_Small = 16974007; // 0x10300b7 field public static final int Widget_Holo_Light_Button_Toggle = 16974009; // 0x10300b9 field public static final int Widget_Holo_Light_CalendarView = 16974061; // 0x10300ed + field public static final int Widget_Holo_Light_CheckedTextView = 16974298; // 0x10301da field public static final int Widget_Holo_Light_CompoundButton_CheckBox = 16974012; // 0x10300bc field public static final int Widget_Holo_Light_CompoundButton_RadioButton = 16974032; // 0x10300d0 field public static final int Widget_Holo_Light_CompoundButton_Star = 16974036; // 0x10300d4 @@ -2673,6 +2678,7 @@ package android.app { method public void invalidateOptionsMenu(); method public boolean isChangingConfigurations(); method public final boolean isChild(); + method public boolean isDestroyed(); method public boolean isFinishing(); method public boolean isTaskRoot(); method public final deprecated android.database.Cursor managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String); @@ -3480,6 +3486,7 @@ package android.app { method public abstract int getBackStackEntryCount(); method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String); method public void invalidateOptionsMenu(); + method public abstract boolean isDestroyed(); method public abstract void popBackStack(); method public abstract void popBackStack(java.lang.String, int); method public abstract void popBackStack(int, int); @@ -23714,6 +23721,7 @@ package android.view { public final class Display { method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point); method public int getDisplayId(); + method public int getFlags(); method public deprecated int getHeight(); method public void getMetrics(android.util.DisplayMetrics); method public java.lang.String getName(); @@ -23728,6 +23736,7 @@ package android.view { method public deprecated int getWidth(); method public boolean isValid(); field public static final int DEFAULT_DISPLAY = 0; // 0x0 + field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1 } public class DragEvent implements android.os.Parcelable { diff --git a/api/current.txt b/api/current.txt index 4e7d01225b21..e86de90ab46d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2678,6 +2678,7 @@ package android.app { method public void invalidateOptionsMenu(); method public boolean isChangingConfigurations(); method public final boolean isChild(); + method public boolean isDestroyed(); method public boolean isFinishing(); method public boolean isTaskRoot(); method public final deprecated android.database.Cursor managedQuery(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String); @@ -3485,6 +3486,7 @@ package android.app { method public abstract int getBackStackEntryCount(); method public abstract android.app.Fragment getFragment(android.os.Bundle, java.lang.String); method public void invalidateOptionsMenu(); + method public abstract boolean isDestroyed(); method public abstract void popBackStack(); method public abstract void popBackStack(java.lang.String, int); method public abstract void popBackStack(int, int); @@ -23719,6 +23721,7 @@ package android.view { public final class Display { method public void getCurrentSizeRange(android.graphics.Point, android.graphics.Point); method public int getDisplayId(); + method public int getFlags(); method public deprecated int getHeight(); method public void getMetrics(android.util.DisplayMetrics); method public java.lang.String getName(); @@ -23733,6 +23736,7 @@ package android.view { method public deprecated int getWidth(); method public boolean isValid(); field public static final int DEFAULT_DISPLAY = 0; // 0x0 + field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1 } public class DragEvent implements android.os.Parcelable { diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 7606d5e3d215..5dc9da285ee9 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -685,6 +685,7 @@ public class Activity extends ContextThemeWrapper private boolean mStopped; boolean mFinished; boolean mStartedActivity; + private boolean mDestroyed; /** true if the activity is going through a transient pause */ /*package*/ boolean mTemporaryPause = false; /** true if the activity is being destroyed in order to recreate it with a new configuration */ @@ -4089,6 +4090,14 @@ public class Activity extends ContextThemeWrapper } /** + * Returns true if the final {@link #onDestroy()} call has been made + * on the Activity, so this instance is now dead. + */ + public boolean isDestroyed() { + return mDestroyed; + } + + /** * Check to see whether this activity is in the process of being destroyed in order to be * recreated with a new configuration. This is often used in * {@link #onStop} to determine whether the state needs to be cleaned up or will be passed @@ -5258,6 +5267,7 @@ public class Activity extends ContextThemeWrapper } final void performDestroy() { + mDestroyed = true; mWindow.destroy(); mFragments.dispatchDestroy(); onDestroy(); diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index ef9f6d4289a6..5f65f0804eec 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4530,6 +4530,14 @@ public final class ActivityThread { IContentProvider provider = pr.mProvider; IBinder jBinder = provider.asBinder(); + if (!jBinder.isBinderAlive()) { + // The hosting process of the provider has died; we can't + // use this one. + Log.i(TAG, "Acquiring provider " + auth + " for user " + userId + + ": existing object's process dead"); + handleUnstableProviderDiedLocked(jBinder, true); + return null; + } // Only increment the ref count if we have one. If we don't then the // provider is not reference counted and never needs to be released. @@ -4670,33 +4678,37 @@ public final class ActivityThread { } final void handleUnstableProviderDied(IBinder provider, boolean fromClient) { - synchronized(mProviderMap) { - ProviderRefCount prc = mProviderRefCountMap.get(provider); - if (prc != null) { - if (DEBUG_PROVIDER) Slog.v(TAG, "Cleaning up dead provider " - + provider + " " + prc.holder.info.name); - mProviderRefCountMap.remove(provider); - if (prc.client != null && prc.client.mNames != null) { - for (String name : prc.client.mNames) { - ProviderClientRecord pr = mProviderMap.get(name); - if (pr != null && pr.mProvider.asBinder() == provider) { - Slog.i(TAG, "Removing dead content provider: " + name); - mProviderMap.remove(name); - } + synchronized (mProviderMap) { + handleUnstableProviderDiedLocked(provider, fromClient); + } + } + + final void handleUnstableProviderDiedLocked(IBinder provider, boolean fromClient) { + ProviderRefCount prc = mProviderRefCountMap.get(provider); + if (prc != null) { + if (DEBUG_PROVIDER) Slog.v(TAG, "Cleaning up dead provider " + + provider + " " + prc.holder.info.name); + mProviderRefCountMap.remove(provider); + if (prc.client != null && prc.client.mNames != null) { + for (String name : prc.client.mNames) { + ProviderClientRecord pr = mProviderMap.get(name); + if (pr != null && pr.mProvider.asBinder() == provider) { + Slog.i(TAG, "Removing dead content provider: " + name); + mProviderMap.remove(name); } } - if (fromClient) { - // We found out about this due to execution in our client - // code. Tell the activity manager about it now, to ensure - // that the next time we go to do anything with the provider - // it knows it is dead (so we don't race with its death - // notification). - try { - ActivityManagerNative.getDefault().unstableProviderDied( - prc.holder.connection); - } catch (RemoteException e) { - //do nothing content provider object is dead any way - } + } + if (fromClient) { + // We found out about this due to execution in our client + // code. Tell the activity manager about it now, to ensure + // that the next time we go to do anything with the provider + // it knows it is dead (so we don't race with its death + // notification). + try { + ActivityManagerNative.getDefault().unstableProviderDied( + prc.holder.connection); + } catch (RemoteException e) { + //do nothing content provider object is dead any way } } } diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index c41405b318eb..59fa1e00270d 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1703,6 +1703,7 @@ class ContextImpl extends Context { if (packageName.equals("system") || packageName.equals("android")) { final ContextImpl context = new ContextImpl(mMainThread.getSystemContext()); context.mBasePackageName = mBasePackageName; + context.mUser = user; return context; } diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java index e98329912470..10ea109edc08 100644 --- a/core/java/android/app/FragmentManager.java +++ b/core/java/android/app/FragmentManager.java @@ -318,6 +318,12 @@ public abstract class FragmentManager { public abstract Fragment.SavedState saveFragmentInstanceState(Fragment f); /** + * Returns true if the final {@link Activity#onDestroy() Activity.onDestroy()} + * call has been made on the FragmentManager's Activity, so this instance is now dead. + */ + public abstract boolean isDestroyed(); + + /** * Print the FragmentManager's state into the given stream. * * @param prefix Text to print at the front of each line. @@ -588,6 +594,11 @@ final class FragmentManagerImpl extends FragmentManager { } @Override + public boolean isDestroyed() { + return mDestroyed; + } + + @Override public String toString() { StringBuilder sb = new StringBuilder(128); sb.append("FragmentManager{"); diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 4ab8272f2f84..9e406d452fa4 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -1219,7 +1219,7 @@ public abstract class ContentResolver { public final void registerContentObserver(Uri uri, boolean notifyForDescendents, ContentObserver observer) { - registerContentObserver(uri, notifyForDescendents, observer, UserHandle.getCallingUserId()); + registerContentObserver(uri, notifyForDescendents, observer, UserHandle.myUserId()); } /** @hide - designated user version */ diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java index 7b3d8cda9455..357997781eda 100644 --- a/core/java/android/content/pm/PackageUserState.java +++ b/core/java/android/content/pm/PackageUserState.java @@ -34,14 +34,6 @@ public class PackageUserState { public HashSet<String> enabledComponents; public PackageUserState() { - this(true); - } - - /** @hide */ - public PackageUserState(boolean isSystem) { - if (!isSystem) { - stopped = notLaunched = true; - } installed = true; enabled = COMPONENT_ENABLED_STATE_DEFAULT; } diff --git a/core/java/android/database/AbstractCursor.java b/core/java/android/database/AbstractCursor.java index e7ff92d0b3e2..300b4d1982df 100644 --- a/core/java/android/database/AbstractCursor.java +++ b/core/java/android/database/AbstractCursor.java @@ -19,6 +19,7 @@ package android.database; import android.content.ContentResolver; import android.net.Uri; import android.os.Bundle; +import android.os.UserHandle; import android.util.Log; import java.lang.ref.WeakReference; @@ -350,6 +351,11 @@ public abstract class AbstractCursor implements CrossProcessCursor { * specific row URI, or a base URI for a whole class of content. */ public void setNotificationUri(ContentResolver cr, Uri notifyUri) { + setNotificationUri(cr, notifyUri, UserHandle.myUserId()); + } + + /** @hide - set the notification uri but with an observer for a particular user's view */ + public void setNotificationUri(ContentResolver cr, Uri notifyUri, int userHandle) { synchronized (mSelfObserverLock) { mNotifyUri = notifyUri; mContentResolver = cr; @@ -357,7 +363,7 @@ public abstract class AbstractCursor implements CrossProcessCursor { mContentResolver.unregisterContentObserver(mSelfObserver); } mSelfObserver = new SelfContentObserver(this); - mContentResolver.registerContentObserver(mNotifyUri, true, mSelfObserver); + mContentResolver.registerContentObserver(mNotifyUri, true, mSelfObserver, userHandle); mSelfObserverRegistered = true; } } diff --git a/core/java/android/hardware/usb/IUsbManager.aidl b/core/java/android/hardware/usb/IUsbManager.aidl index 98bd4f57e867..8286686fec61 100644 --- a/core/java/android/hardware/usb/IUsbManager.aidl +++ b/core/java/android/hardware/usb/IUsbManager.aidl @@ -44,12 +44,12 @@ interface IUsbManager /* Sets the default package for a USB device * (or clears it if the package name is null) */ - void setDevicePackage(in UsbDevice device, String packageName); + void setDevicePackage(in UsbDevice device, String packageName, int userId); /* Sets the default package for a USB accessory * (or clears it if the package name is null) */ - void setAccessoryPackage(in UsbAccessory accessory, String packageName); + void setAccessoryPackage(in UsbAccessory accessory, String packageName, int userId); /* Returns true if the caller has permission to access the device. */ boolean hasDevicePermission(in UsbDevice device); @@ -77,10 +77,10 @@ interface IUsbManager void grantAccessoryPermission(in UsbAccessory accessory, int uid); /* Returns true if the USB manager has default preferences or permissions for the package */ - boolean hasDefaults(String packageName); + boolean hasDefaults(String packageName, int userId); /* Clears default preferences and permissions for the package */ - void clearDefaults(String packageName); + void clearDefaults(String packageName, int userId); /* Sets the current USB function. */ void setCurrentFunction(String function, boolean makeDefault); diff --git a/core/java/android/net/CaptivePortalTracker.java b/core/java/android/net/CaptivePortalTracker.java index 9b1109461391..ce71e6b04c11 100644 --- a/core/java/android/net/CaptivePortalTracker.java +++ b/core/java/android/net/CaptivePortalTracker.java @@ -31,6 +31,7 @@ import android.os.UserHandle; import android.os.Message; import android.os.RemoteException; import android.provider.Settings; +import android.telephony.TelephonyManager; import android.util.Log; import com.android.internal.util.State; @@ -63,6 +64,7 @@ public class CaptivePortalTracker extends StateMachine { private boolean mNotificationShown = false; private boolean mIsCaptivePortalCheckEnabled = false; private IConnectivityManager mConnService; + private TelephonyManager mTelephonyManager; private Context mContext; private NetworkInfo mNetworkInfo; @@ -84,6 +86,7 @@ public class CaptivePortalTracker extends StateMachine { mContext = context; mConnService = cs; + mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); IntentFilter filter = new IntentFilter(); filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); @@ -326,17 +329,33 @@ public class CaptivePortalTracker extends StateMachine { if (visible) { CharSequence title; - if (mNetworkInfo.getType() == ConnectivityManager.TYPE_WIFI) { - title = r.getString(R.string.wifi_available_sign_in, 0); - } else { - title = r.getString(R.string.network_available_sign_in, 0); + CharSequence details; + int icon; + switch (mNetworkInfo.getType()) { + case ConnectivityManager.TYPE_WIFI: + title = r.getString(R.string.wifi_available_sign_in, 0); + details = r.getString(R.string.network_available_sign_in_detailed, + mNetworkInfo.getExtraInfo()); + icon = R.drawable.stat_notify_wifi_in_range; + break; + case ConnectivityManager.TYPE_MOBILE: + title = r.getString(R.string.network_available_sign_in, 0); + // TODO: Change this to pull from NetworkInfo once a printable + // name has been added to it + details = mTelephonyManager.getNetworkOperatorName(); + icon = R.drawable.stat_notify_rssi_in_range; + break; + default: + title = r.getString(R.string.network_available_sign_in, 0); + details = r.getString(R.string.network_available_sign_in_detailed, + mNetworkInfo.getExtraInfo()); + icon = R.drawable.stat_notify_rssi_in_range; + break; } - CharSequence details = r.getString(R.string.network_available_sign_in_detailed, - mNetworkInfo.getExtraInfo()); Notification notification = new Notification(); notification.when = 0; - notification.icon = com.android.internal.R.drawable.stat_notify_wifi_in_range; + notification.icon = icon; notification.flags = Notification.FLAG_AUTO_CANCEL; Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(mUrl)); intent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | diff --git a/core/java/android/nfc/INfcAdapterExtras.aidl b/core/java/android/nfc/INfcAdapterExtras.aidl index 2b9d4f04951a..41ebf636c89e 100644 --- a/core/java/android/nfc/INfcAdapterExtras.aidl +++ b/core/java/android/nfc/INfcAdapterExtras.aidl @@ -29,4 +29,5 @@ interface INfcAdapterExtras { int getCardEmulationRoute(in String pkg); void setCardEmulationRoute(in String pkg, int route); void authenticate(in String pkg, in byte[] token); + String getDriverName(in String pkg); } diff --git a/core/java/android/os/BatteryManager.java b/core/java/android/os/BatteryManager.java index 7b16f4daf153..2e38960ed3d2 100644 --- a/core/java/android/os/BatteryManager.java +++ b/core/java/android/os/BatteryManager.java @@ -117,4 +117,8 @@ public class BatteryManager { public static final int BATTERY_PLUGGED_USB = 2; /** Power source is wireless. */ public static final int BATTERY_PLUGGED_WIRELESS = 4; + + /** @hide */ + public static final int BATTERY_PLUGGED_ANY = + BATTERY_PLUGGED_AC | BATTERY_PLUGGED_USB | BATTERY_PLUGGED_WIRELESS; } diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index 557d3f306967..6d6d147b8a5e 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -37,7 +37,8 @@ interface IPowerManager void nap(long time); boolean isScreenOn(); - void reboot(String reason); + void reboot(boolean confirm, String reason, boolean wait); + void shutdown(boolean confirm, boolean wait); void crash(String message); void setStayOnSetting(int val); diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index ae50ddbc1447..fb02c0a2fb39 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -596,7 +596,7 @@ public final class PowerManager { */ public void reboot(String reason) { try { - mService.reboot(reason); + mService.reboot(false, reason, true); } catch (RemoteException e) { } } diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index 9bfa8c078817..09ff7bec739b 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -1083,6 +1083,12 @@ public abstract class PreferenceActivity extends ListActivity implements } return; } + if (mSinglePane) { + mFragmentBreadCrumbs.setVisibility(View.GONE); + // Hide the breadcrumb section completely for single-pane + View bcSection = findViewById(com.android.internal.R.id.breadcrumb_section); + if (bcSection != null) bcSection.setVisibility(View.GONE); + } mFragmentBreadCrumbs.setMaxVisible(2); mFragmentBreadCrumbs.setActivity(this); } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2a8cf21f1c8e..3bbdf3655001 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -911,17 +911,20 @@ public final class Settings { } private static final HashSet<String> MOVED_TO_GLOBAL; + private static final HashSet<String> MOVED_TO_SECURE_THEN_GLOBAL; static { MOVED_TO_GLOBAL = new HashSet<String>(); + MOVED_TO_SECURE_THEN_GLOBAL = new HashSet<String>(); + // these were originally in system but migrated to secure in the past, // so are duplicated in the Secure.* namespace - MOVED_TO_GLOBAL.add(Global.ADB_ENABLED); - MOVED_TO_GLOBAL.add(Global.BLUETOOTH_ON); - MOVED_TO_GLOBAL.add(Global.DATA_ROAMING); - MOVED_TO_GLOBAL.add(Global.DEVICE_PROVISIONED); - MOVED_TO_GLOBAL.add(Global.INSTALL_NON_MARKET_APPS); - MOVED_TO_GLOBAL.add(Global.USB_MASS_STORAGE_ENABLED); - MOVED_TO_GLOBAL.add(Global.HTTP_PROXY); + MOVED_TO_SECURE_THEN_GLOBAL.add(Global.ADB_ENABLED); + MOVED_TO_SECURE_THEN_GLOBAL.add(Global.BLUETOOTH_ON); + MOVED_TO_SECURE_THEN_GLOBAL.add(Global.DATA_ROAMING); + MOVED_TO_SECURE_THEN_GLOBAL.add(Global.DEVICE_PROVISIONED); + MOVED_TO_SECURE_THEN_GLOBAL.add(Global.INSTALL_NON_MARKET_APPS); + MOVED_TO_SECURE_THEN_GLOBAL.add(Global.USB_MASS_STORAGE_ENABLED); + MOVED_TO_SECURE_THEN_GLOBAL.add(Global.HTTP_PROXY); // these are moving directly from system to global MOVED_TO_GLOBAL.add(Settings.Global.AIRPLANE_MODE_ON); @@ -954,6 +957,17 @@ public final class Settings { MOVED_TO_GLOBAL.add(Settings.Global.ALWAYS_FINISH_ACTIVITIES); } + /** @hide */ + public static void getMovedKeys(HashSet<String> outKeySet) { + outKeySet.addAll(MOVED_TO_GLOBAL); + outKeySet.addAll(MOVED_TO_SECURE_THEN_GLOBAL); + } + + /** @hide */ + public static void getNonLegacyMovedKeys(HashSet<String> outKeySet) { + outKeySet.addAll(MOVED_TO_GLOBAL); + } + /** * Look up a name in the database. * @param resolver to access the database with @@ -972,7 +986,7 @@ public final class Settings { + " to android.provider.Settings.Secure, returning read-only value."); return Secure.getStringForUser(resolver, name, userHandle); } - if (MOVED_TO_GLOBAL.contains(name)) { + if (MOVED_TO_GLOBAL.contains(name) || MOVED_TO_SECURE_THEN_GLOBAL.contains(name)) { Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.System" + " to android.provider.Settings.Global, returning read-only value."); return Global.getStringForUser(resolver, name, userHandle); @@ -999,7 +1013,7 @@ public final class Settings { + " to android.provider.Settings.Secure, value is unchanged."); return false; } - if (MOVED_TO_GLOBAL.contains(name)) { + if (MOVED_TO_GLOBAL.contains(name) || MOVED_TO_SECURE_THEN_GLOBAL.contains(name)) { Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.System" + " to android.provider.Settings.Global, value is unchanged."); return false; @@ -1019,7 +1033,7 @@ public final class Settings { + " to android.provider.Settings.Secure, returning Secure URI."); return Secure.getUriFor(Secure.CONTENT_URI, name); } - if (MOVED_TO_GLOBAL.contains(name)) { + if (MOVED_TO_GLOBAL.contains(name) || MOVED_TO_SECURE_THEN_GLOBAL.contains(name)) { Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.System" + " to android.provider.Settings.Global, returning read-only global URI."); return Global.getUriFor(Global.CONTENT_URI, name); @@ -2257,7 +2271,7 @@ public final class Settings { * @hide */ public static final String[] SETTINGS_TO_BACKUP = { - STAY_ON_WHILE_PLUGGED_IN, + STAY_ON_WHILE_PLUGGED_IN, // moved to global WIFI_USE_STATIC_IP, WIFI_STATIC_IP, WIFI_STATIC_GATEWAY, @@ -2272,7 +2286,7 @@ public final class Settings { SCREEN_BRIGHTNESS_MODE, SCREEN_AUTO_BRIGHTNESS_ADJ, VIBRATE_INPUT_DEVICES, - MODE_RINGER, + MODE_RINGER, // moved to global MODE_RINGER_STREAMS_AFFECTED, MUTE_STREAMS_AFFECTED, VOLUME_VOICE, @@ -2293,20 +2307,18 @@ public final class Settings { TEXT_AUTO_CAPS, TEXT_AUTO_PUNCTUATE, TEXT_SHOW_PASSWORD, - AUTO_TIME, - AUTO_TIME_ZONE, + AUTO_TIME, // moved to global + AUTO_TIME_ZONE, // moved to global TIME_12_24, DATE_FORMAT, DTMF_TONE_WHEN_DIALING, DTMF_TONE_TYPE_WHEN_DIALING, - Global.EMERGENCY_TONE, - Global.CALL_AUTO_RETRY, HEARING_AID, TTY_MODE, SOUND_EFFECTS_ENABLED, HAPTIC_FEEDBACK_ENABLED, - POWER_SOUNDS_ENABLED, - DOCK_SOUNDS_ENABLED, + POWER_SOUNDS_ENABLED, // moved to global + DOCK_SOUNDS_ENABLED, // moved to global LOCKSCREEN_SOUNDS_ENABLED, SHOW_WEB_SUGGESTIONS, NOTIFICATION_LIGHT_PULSE, @@ -2702,6 +2714,11 @@ public final class Settings { MOVED_TO_GLOBAL.add(Settings.Global.PREFERRED_CDMA_SUBSCRIPTION); } + /** @hide */ + public static void getMovedKeys(HashSet<String> outKeySet) { + outKeySet.addAll(MOVED_TO_GLOBAL); + } + /** * Look up a name in the database. * @param resolver to access the database with @@ -3993,12 +4010,11 @@ public final class Settings { * @hide */ public static final String[] SETTINGS_TO_BACKUP = { - ADB_ENABLED, BUGREPORT_IN_POWER_MENU, ALLOW_MOCK_LOCATION, PARENTAL_CONTROL_ENABLED, PARENTAL_CONTROL_REDIRECT_URL, - USB_MASS_STORAGE_ENABLED, + USB_MASS_STORAGE_ENABLED, // moved to global ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE, ACCESSIBILITY_DISPLAY_MAGNIFICATION_AUTO_UPDATE, @@ -4017,9 +4033,9 @@ public final class Settings { TTS_DEFAULT_COUNTRY, TTS_ENABLED_PLUGINS, TTS_DEFAULT_LOCALE, - WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, - WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY, - WIFI_NUM_OPEN_NETWORKS_KEPT, + WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, // moved to global + WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY, // moved to global + WIFI_NUM_OPEN_NETWORKS_KEPT, // moved to global MOUNT_PLAY_NOTIFICATION_SND, MOUNT_UMS_AUTOSTART, MOUNT_UMS_PROMPT, @@ -5251,6 +5267,38 @@ public final class Settings { public static final String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities"; + /** + * Settings to backup. This is here so that it's in the same place as the settings + * keys and easy to update. + * + * These keys may be mentioned in the SETTINGS_TO_BACKUP arrays in System + * and Secure as well. This is because those tables drive both backup and + * restore, and restore needs to properly whitelist keys that used to live + * in those namespaces. The keys will only actually be backed up / restored + * if they are also mentioned in this table (Global.SETTINGS_TO_BACKUP). + * + * NOTE: Settings are backed up and restored in the order they appear + * in this array. If you have one setting depending on another, + * make sure that they are ordered appropriately. + * + * @hide + */ + public static final String[] SETTINGS_TO_BACKUP = { + STAY_ON_WHILE_PLUGGED_IN, + MODE_RINGER, + AUTO_TIME, + AUTO_TIME_ZONE, + POWER_SOUNDS_ENABLED, + DOCK_SOUNDS_ENABLED, + USB_MASS_STORAGE_ENABLED, + ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED, + WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, + WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY, + WIFI_NUM_OPEN_NETWORKS_KEPT, + EMERGENCY_TONE, + CALL_AUTO_RETRY, + }; + // Populated lazily, guarded by class object: private static NameValueCache sNameValueCache = new NameValueCache( SYS_PROP_SETTING_VERSION, diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index d2bed489e23d..123accae4f6e 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -475,10 +475,14 @@ public abstract class Layout { Alignment align = getParagraphAlignment(line); int dir = getParagraphDirection(line); - int x; if (align == Alignment.ALIGN_LEFT) { - x = left; - } else if (align == Alignment.ALIGN_NORMAL) { + align = (dir == DIR_LEFT_TO_RIGHT) ? Alignment.ALIGN_NORMAL : Alignment.ALIGN_OPPOSITE; + } else if (align == Alignment.ALIGN_RIGHT) { + align = (dir == DIR_LEFT_TO_RIGHT) ? Alignment.ALIGN_OPPOSITE : Alignment.ALIGN_NORMAL; + } + + int x; + if (align == Alignment.ALIGN_NORMAL) { if (dir == DIR_LEFT_TO_RIGHT) { x = left; } else { @@ -498,12 +502,11 @@ public abstract class Layout { } } int max = (int)getLineExtent(line, tabStops, false); - if (align == Alignment.ALIGN_RIGHT) { - x = right - max; - } else if (align == Alignment.ALIGN_OPPOSITE) { + if (align == Alignment.ALIGN_OPPOSITE) { if (dir == DIR_LEFT_TO_RIGHT) { x = right - max; } else { + // max is negative here x = left - max; } } else { // Alignment.ALIGN_CENTER diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index cf584581df3f..662dc45c005b 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -79,38 +79,23 @@ public final class Display { public static final int DEFAULT_DISPLAY = 0; /** - * Display flag: Indicates that the display supports secure video output. + * Display flag: Indicates that the display supports compositing content + * that is stored in protected graphics buffers. * <p> - * This flag is used to indicate that the display supports content protection - * mechanisms for secure video output at the display interface, such as HDCP. - * These mechanisms may be used to protect secure content as it leaves the device. + * Secure (DRM) video decoders may allocate protected graphics buffers to request that + * a hardware-protected path be provided between the video decoder and the external + * display sink. If a hardware-protected path is not available, then content stored + * in protected graphics buffers may not be composited. * </p><p> - * While mirroring content to multiple displays, it can happen that certain - * display devices support secure video output while other display devices do not. - * The secure content will be shown only on the display devices that support - * secure video output and will be blanked on other display devices that do - * not support secure video output. - * </p><p> - * This flag mainly applies to external display devices such as HDMI or - * Wifi display. Built-in display devices are usually considered secure. - * </p> - * - * @hide pending review - */ - public static final int FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT = 1 << 0; - - /** - * Display flag: Indicates that the display supports secure in-memory video buffers. - * <p> - * This flag is used to indicate that the display supports content protection - * mechanisms for in-memory video buffers, such as secure memory areas. - * These mechanisms may be used to protect secure video buffers in memory from - * the video decoder to the display compositor and the video interface. + * If this flag is not set, then the display device does not support compositing + * protected buffers; the user may see a blank region on the screen instead of + * the protected content. An application can use this flag as a hint that it should + * select an alternate content stream or adopt a different strategy for decoding + * content that does not rely on protected buffers so as to ensure that the user + * can view the content on the display as expected. * </p> - * - * @hide pending review */ - public static final int FLAG_SUPPORTS_SECURE_VIDEO_BUFFERS = 1 << 1; + public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1 << 0; /** * Internal method to create a display. @@ -196,7 +181,7 @@ public final class Display { * * @return The display flags. * - * @hide pending review + * @see #FLAG_SUPPORTS_PROTECTED_BUFFERS */ public int getFlags() { synchronized (this) { diff --git a/core/java/android/view/DisplayInfo.java b/core/java/android/view/DisplayInfo.java index c968ec549a7b..fe056348ad69 100644 --- a/core/java/android/view/DisplayInfo.java +++ b/core/java/android/view/DisplayInfo.java @@ -299,11 +299,8 @@ public final class DisplayInfo implements Parcelable { private static String flagsToString(int flags) { StringBuilder result = new StringBuilder(); - if ((flags & Display.FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT) != 0) { - result.append(", FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT"); - } - if ((flags & Display.FLAG_SUPPORTS_SECURE_VIDEO_BUFFERS) != 0) { - result.append(", FLAG_SUPPORTS_SECURE_VIDEO_BUFFERS"); + if ((flags & Display.FLAG_SUPPORTS_PROTECTED_BUFFERS) != 0) { + result.append(", FLAG_SUPPORTS_PROTECTED_BUFFERS"); } return result.toString(); } diff --git a/core/java/android/view/GLES20RecordingCanvas.java b/core/java/android/view/GLES20RecordingCanvas.java index ba8be6c34763..d2df45adec13 100644 --- a/core/java/android/view/GLES20RecordingCanvas.java +++ b/core/java/android/view/GLES20RecordingCanvas.java @@ -236,18 +236,6 @@ class GLES20RecordingCanvas extends GLES20Canvas implements Poolable<GLES20Recor } @Override - public void drawRect(Rect r, Paint paint) { - super.drawRect(r, paint); - recordShaderBitmap(paint); - } - - @Override - public void drawRect(RectF r, Paint paint) { - super.drawRect(r, paint); - recordShaderBitmap(paint); - } - - @Override public void drawRoundRect(RectF rect, float rx, float ry, Paint paint) { super.drawRoundRect(rect, rx, ry, paint); recordShaderBitmap(paint); diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java index 99987bfd2793..37e0a3677fd7 100644 --- a/core/java/android/view/HardwareRenderer.java +++ b/core/java/android/view/HardwareRenderer.java @@ -507,17 +507,22 @@ public abstract class HardwareRenderer { * @param width The width of the drawing surface. * @param height The height of the drawing surface. * @param surface The surface to hardware accelerate + * + * @return true if the surface was initialized, false otherwise. Returning + * false might mean that the surface was already initialized. */ - void initializeIfNeeded(int width, int height, Surface surface) + boolean initializeIfNeeded(int width, int height, Surface surface) throws Surface.OutOfResourcesException { if (isRequested()) { // We lost the gl context, so recreate it. if (!isEnabled()) { if (initialize(surface)) { setup(width, height); + return true; } } - } + } + return false; } /** diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java index 4873860d5934..a74e438c07f4 100644 --- a/core/java/android/view/ScaleGestureDetector.java +++ b/core/java/android/view/ScaleGestureDetector.java @@ -19,9 +19,6 @@ package android.view; import android.content.Context; import android.os.SystemClock; import android.util.FloatMath; -import android.util.Log; - -import java.util.Arrays; /** * Detects scaling transformation gestures using the supplied {@link MotionEvent}s. @@ -143,11 +140,16 @@ public class ScaleGestureDetector { private int mSpanSlop; private int mMinSpan; - private float[] mTouchHistoryLastAccepted; - private int[] mTouchHistoryDirection; - private long[] mTouchHistoryLastAcceptedTime; + // Bounds for recently seen values + private float mTouchUpper; + private float mTouchLower; + private float mTouchHistoryLastAccepted; + private int mTouchHistoryDirection; + private long mTouchHistoryLastAcceptedTime; + private int mTouchMinMajor; private static final long TOUCH_STABILIZE_TIME = 128; // ms + private static final int TOUCH_MIN_MAJOR = 48; // dp /** * Consistency verifier for debugging purposes. @@ -160,6 +162,8 @@ public class ScaleGestureDetector { mContext = context; mListener = listener; mSpanSlop = ViewConfiguration.get(context).getScaledTouchSlop() * 2; + mTouchMinMajor = + (int) (context.getResources().getDisplayMetrics().density * TOUCH_MIN_MAJOR + 0.5f); mMinSpan = context.getResources().getDimensionPixelSize( com.android.internal.R.dimen.config_minScalingSpan); } @@ -172,81 +176,55 @@ public class ScaleGestureDetector { private void addTouchHistory(MotionEvent ev) { final long currentTime = SystemClock.uptimeMillis(); final int count = ev.getPointerCount(); + boolean accept = currentTime - mTouchHistoryLastAcceptedTime >= TOUCH_STABILIZE_TIME; + float total = 0; + int sampleCount = 0; for (int i = 0; i < count; i++) { - final int id = ev.getPointerId(i); - ensureTouchHistorySize(id); - - final boolean hasLastAccepted = !Float.isNaN(mTouchHistoryLastAccepted[id]); - boolean accept = true; + final boolean hasLastAccepted = !Float.isNaN(mTouchHistoryLastAccepted); final int historySize = ev.getHistorySize(); - for (int h = 0; h < historySize + 1; h++) { - final float major; - final float minor; + final int pointerSampleCount = historySize + 1; + for (int h = 0; h < pointerSampleCount; h++) { + float major; if (h < historySize) { major = ev.getHistoricalTouchMajor(i, h); - minor = ev.getHistoricalTouchMinor(i, h); } else { major = ev.getTouchMajor(i); - minor = ev.getTouchMinor(i); } - final float avg = (major + minor) / 2; + if (major < mTouchMinMajor) major = mTouchMinMajor; + total += major; + + if (Float.isNaN(mTouchUpper) || major > mTouchUpper) { + mTouchUpper = major; + } + if (Float.isNaN(mTouchLower) || major < mTouchLower) { + mTouchLower = major; + } if (hasLastAccepted) { - final int directionSig = (int) Math.signum(avg - mTouchHistoryLastAccepted[id]); - if (directionSig != mTouchHistoryDirection[id] || - (directionSig == 0 && mTouchHistoryDirection[id] == 0)) { - mTouchHistoryDirection[id] = directionSig; + final int directionSig = (int) Math.signum(major - mTouchHistoryLastAccepted); + if (directionSig != mTouchHistoryDirection || + (directionSig == 0 && mTouchHistoryDirection == 0)) { + mTouchHistoryDirection = directionSig; final long time = h < historySize ? ev.getHistoricalEventTime(h) : ev.getEventTime(); - mTouchHistoryLastAcceptedTime[id] = time; - accept = false; - } - if (currentTime - mTouchHistoryLastAcceptedTime[id] < TOUCH_STABILIZE_TIME) { + mTouchHistoryLastAcceptedTime = time; accept = false; } } } - - if (accept) { - float newAccepted = (ev.getTouchMajor(i) + ev.getTouchMinor(i)) / 2; - if (hasLastAccepted) { - newAccepted = (mTouchHistoryLastAccepted[id] + newAccepted) / 2; - } - mTouchHistoryLastAccepted[id] = newAccepted; - mTouchHistoryDirection[id] = 0; - mTouchHistoryLastAcceptedTime[id] = ev.getEventTime(); - } + sampleCount += pointerSampleCount; } - } - /** - * Clear out the touch history for a given pointer id. - * @param id pointer id to clear - * @see #addTouchHistory(MotionEvent) - */ - private boolean removeTouchHistoryForId(int id) { - if (id >= mTouchHistoryLastAccepted.length) { - return false; - } - mTouchHistoryLastAccepted[id] = Float.NaN; - mTouchHistoryDirection[id] = 0; - mTouchHistoryLastAcceptedTime[id] = 0; - return true; - } + final float avg = total / sampleCount; - /** - * Get the adjusted combined touchMajor/touchMinor value for a given pointer id - * @param id the pointer id of the data to obtain - * @return the adjusted major/minor value for the point at id - * @see #addTouchHistory(MotionEvent) - */ - private float getAdjustedTouchHistory(int id) { - if (id >= mTouchHistoryLastAccepted.length) { - Log.e(TAG, "Error retrieving adjusted touch history for id=" + id + - " - incomplete event stream?"); - return 0; + if (accept) { + float newAccepted = (mTouchUpper + mTouchLower + avg) / 3; + mTouchUpper = (mTouchUpper + newAccepted) / 2; + mTouchLower = (mTouchLower + newAccepted) / 2; + mTouchHistoryLastAccepted = newAccepted; + mTouchHistoryDirection = 0; + mTouchHistoryLastAcceptedTime = ev.getEventTime(); } - return mTouchHistoryLastAccepted[id]; } /** @@ -254,41 +232,11 @@ public class ScaleGestureDetector { * @see #addTouchHistory(MotionEvent) */ private void clearTouchHistory() { - if (mTouchHistoryLastAccepted == null) { - // All three arrays will be null if this is the case; nothing to do. - return; - } - Arrays.fill(mTouchHistoryLastAccepted, Float.NaN); - Arrays.fill(mTouchHistoryDirection, 0); - Arrays.fill(mTouchHistoryLastAcceptedTime, 0); - } - - private void ensureTouchHistorySize(int id) { - final int requiredSize = id + 1; - if (mTouchHistoryLastAccepted == null || mTouchHistoryLastAccepted.length < requiredSize) { - final float[] newLastAccepted = new float[requiredSize]; - final int[] newDirection = new int[requiredSize]; - final long[] newLastAcceptedTime = new long[requiredSize]; - - int oldLength = 0; - if (mTouchHistoryLastAccepted != null) { - System.arraycopy(mTouchHistoryLastAccepted, 0, newLastAccepted, 0, - mTouchHistoryLastAccepted.length); - System.arraycopy(mTouchHistoryDirection, 0, newDirection, 0, - mTouchHistoryDirection.length); - System.arraycopy(mTouchHistoryLastAcceptedTime, 0, newLastAcceptedTime, 0, - mTouchHistoryLastAcceptedTime.length); - oldLength = mTouchHistoryLastAccepted.length; - } - - Arrays.fill(newLastAccepted, oldLength, newLastAccepted.length, Float.NaN); - Arrays.fill(newDirection, oldLength, newDirection.length, 0); - Arrays.fill(newLastAcceptedTime, oldLength, newLastAcceptedTime.length, 0); - - mTouchHistoryLastAccepted = newLastAccepted; - mTouchHistoryDirection = newDirection; - mTouchHistoryLastAcceptedTime = newLastAcceptedTime; - } + mTouchUpper = Float.NaN; + mTouchLower = Float.NaN; + mTouchHistoryLastAccepted = Float.NaN; + mTouchHistoryDirection = 0; + mTouchHistoryLastAcceptedTime = 0; } /** @@ -346,23 +294,16 @@ public class ScaleGestureDetector { final float focusX = sumX / div; final float focusY = sumY / div; - if (pointerUp) { - final int id = event.getPointerId(event.getActionIndex()); - if (!removeTouchHistoryForId(id)) { - Log.e(TAG, "Got ACTION_POINTER_UP for previously unknown id=" + id + - " - incomplete event stream?"); - } - } else { - addTouchHistory(event); - } + + addTouchHistory(event); // Determine average deviation from focal point float devSumX = 0, devSumY = 0; for (int i = 0; i < count; i++) { if (skipIndex == i) continue; - // Average touch major and touch minor and convert the resulting diameter into a radius. - final float touchSize = getAdjustedTouchHistory(event.getPointerId(i)) / 2; + // Convert the resulting diameter into a radius. + final float touchSize = mTouchHistoryLastAccepted / 2; devSumX += Math.abs(event.getX(i) - focusX) + touchSize; devSumY += Math.abs(event.getY(i) - focusY) + touchSize; } diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 3ed47ea27fb1..ae51c1dd3f49 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -2904,6 +2904,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, */ int mOldHeightMeasureSpec = Integer.MIN_VALUE; + @ViewDebug.ExportedProperty(deepExport = true, prefix = "bg_") private Drawable mBackground; private int mBackgroundResource; @@ -5871,6 +5872,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, ((layoutDirection << PFLAG2_LAYOUT_DIRECTION_MASK_SHIFT) & PFLAG2_LAYOUT_DIRECTION_MASK); // We need to resolve all RTL properties as they all depend on layout direction resolveRtlPropertiesIfNeeded(); + requestLayout(); + invalidate(true); } } @@ -11568,8 +11571,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (!isDrawablesResolved()) { resolveDrawables(); } - requestLayout(); - invalidate(true); onRtlPropertiesChanged(getLayoutDirection()); } diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index c013d85a175e..023e58f3a15f 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -923,8 +923,12 @@ public class ViewDebug { private static void dumpViewProperties(Context context, Object view, BufferedWriter out, String prefix) throws IOException { - Class<?> klass = view.getClass(); + if (view == null) { + out.write(prefix + "=4,null "); + return; + } + Class<?> klass = view.getClass(); do { exportFields(context, view, out, klass, prefix); exportMethods(context, view, out, klass, prefix); @@ -1064,8 +1068,8 @@ public class ViewDebug { return; } else if (!type.isPrimitive()) { if (property.deepExport()) { - dumpViewProperties(context, field.get(view), out, prefix - + property.prefix()); + dumpViewProperties(context, field.get(view), out, prefix + + property.prefix()); continue; } } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 438f792f2c62..be2d5b3c8add 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -52,7 +52,6 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.SystemProperties; import android.os.Trace; -import android.os.UserHandle; import android.util.AndroidRuntimeException; import android.util.DisplayMetrics; import android.util.Log; @@ -2817,10 +2816,10 @@ public final class ViewRootImpl implements ViewParent, case MSG_RESIZED: { // Recycled in the fall through... SomeArgs args = (SomeArgs) msg.obj; - if (mWinFrame.equals((Rect) args.arg1) - && mPendingContentInsets.equals((Rect) args.arg2) - && mPendingVisibleInsets.equals((Rect) args.arg3) - && ((Configuration) args.arg4 == null)) { + if (mWinFrame.equals(args.arg1) + && mPendingContentInsets.equals(args.arg2) + && mPendingVisibleInsets.equals(args.arg3) + && args.arg4 == null) { break; } } // fall through... @@ -2882,8 +2881,10 @@ public final class ViewRootImpl implements ViewParent, mSurface != null && mSurface.isValid()) { mFullRedrawNeeded = true; try { - mAttachInfo.mHardwareRenderer.initializeIfNeeded(mWidth, mHeight, - mHolder.getSurface()); + if (mAttachInfo.mHardwareRenderer.initializeIfNeeded( + mWidth, mHeight, mHolder.getSurface())) { + mFullRedrawNeeded = true; + } } catch (Surface.OutOfResourcesException e) { Log.e(TAG, "OutOfResourcesException locking surface", e); try { diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 3ea6df3a89cc..4a3f846f85b1 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -1078,8 +1078,11 @@ public final class InputMethodManager { Handler vh = view.getHandler(); if (vh == null) { // If the view doesn't have a handler, something has changed out - // from under us, so just bail. - if (DEBUG) Log.v(TAG, "ABORT input: no handler for view!"); + // from under us, so just close the current input. + // If we don't close the current input, the current input method can remain on the + // screen without a connection. + if (DEBUG) Log.v(TAG, "ABORT input: no handler for view! Close current input."); + closeCurrentInput(); return false; } if (vh.getLooper() != Looper.myLooper()) { diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 7f0af09fca01..871f7527c51f 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -1055,30 +1055,30 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te if (mChoiceMode == CHOICE_MODE_MULTIPLE || (mChoiceMode == CHOICE_MODE_MULTIPLE_MODAL && mChoiceActionMode != null)) { - boolean newValue = !mCheckStates.get(position, false); - mCheckStates.put(position, newValue); + boolean checked = !mCheckStates.get(position, false); + mCheckStates.put(position, checked); if (mCheckedIdStates != null && mAdapter.hasStableIds()) { - if (newValue) { + if (checked) { mCheckedIdStates.put(mAdapter.getItemId(position), position); } else { mCheckedIdStates.delete(mAdapter.getItemId(position)); } } - if (newValue) { + if (checked) { mCheckedItemCount++; } else { mCheckedItemCount--; } if (mChoiceActionMode != null) { mMultiChoiceModeCallback.onItemCheckedStateChanged(mChoiceActionMode, - position, id, newValue); + position, id, checked); dispatchItemClick = false; } checkedStateChanged = true; } else if (mChoiceMode == CHOICE_MODE_SINGLE) { - boolean newValue = !mCheckStates.get(position, false); - if (newValue) { - mCheckStates.clear(); + boolean checked = !mCheckStates.get(position, false); + mCheckStates.clear(); + if (checked) { mCheckStates.put(position, true); if (mCheckedIdStates != null && mAdapter.hasStableIds()) { mCheckedIdStates.clear(); diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index c67cae636f45..19b825c4fa0f 100644 --- a/core/java/android/widget/Editor.java +++ b/core/java/android/widget/Editor.java @@ -122,6 +122,7 @@ public class Editor { InputMethodState mInputMethodState; DisplayList[] mTextDisplayLists; + int mLastLayoutHeight; boolean mFrozenWithFocus; boolean mSelectionMoved; @@ -1258,6 +1259,16 @@ public class Editor { mTextDisplayLists = new DisplayList[ArrayUtils.idealObjectArraySize(0)]; } + // If the height of the layout changes (usually when inserting or deleting a line, + // but could be changes within a span), invalidate everything. We could optimize + // more aggressively (for example, adding offsets to blocks) but it would be more + // complex and we would only get the benefit in some cases. + int layoutHeight = layout.getHeight(); + if (mLastLayoutHeight != layoutHeight) { + invalidateTextDisplayList(); + mLastLayoutHeight = layoutHeight; + } + DynamicLayout dynamicLayout = (DynamicLayout) layout; int[] blockEndLines = dynamicLayout.getBlockEndLines(); int[] blockIndices = dynamicLayout.getBlockIndices(); diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java index 317baf1552db..925864c9e311 100644 --- a/core/java/android/widget/Spinner.java +++ b/core/java/android/widget/Spinner.java @@ -30,8 +30,11 @@ import android.util.Log; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; +import android.view.ViewTreeObserver; +import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; +import android.widget.PopupWindow.OnDismissListener; /** @@ -978,6 +981,30 @@ public class Spinner extends AbsSpinner implements OnClickListener { super.show(); getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE); setSelection(Spinner.this.getSelectedItemPosition()); + + // Make sure we hide if our anchor goes away. + // TODO: This might be appropriate to push all the way down to PopupWindow, + // but it may have other side effects to investigate first. (Text editing handles, etc.) + final ViewTreeObserver vto = getViewTreeObserver(); + if (vto != null) { + final OnGlobalLayoutListener layoutListener = new OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + if (!Spinner.this.isVisibleToUser()) { + dismiss(); + } + } + }; + vto.addOnGlobalLayoutListener(layoutListener); + setOnDismissListener(new OnDismissListener() { + @Override public void onDismiss() { + final ViewTreeObserver vto = getViewTreeObserver(); + if (vto != null) { + vto.removeOnGlobalLayoutListener(layoutListener); + } + } + }); + } } } } diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 4ad0819467ed..e63c57f47d80 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -150,8 +150,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte resizeGrid(); } else if (count == 1) { - startActivityAsUser(mAdapter.intentForPosition(0), - new UserHandle(UserHandle.getUserId(mLaunchedFromUid))); + startActivity(mAdapter.intentForPosition(0)); mPackageMonitor.unregister(); mRegistered = false; finish(); @@ -364,12 +363,12 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte if (r.match > bestMatch) bestMatch = r.match; } getPackageManager().addPreferredActivity(filter, bestMatch, set, - intent.getComponent(), UserHandle.getUserId(mLaunchedFromUid)); + intent.getComponent()); } } if (intent != null) { - startActivityAsUser(intent, new UserHandle(UserHandle.getUserId(mLaunchedFromUid))); + startActivity(intent); } } @@ -377,7 +376,7 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte Intent in = new Intent().setAction("android.settings.APPLICATION_DETAILS_SETTINGS") .setData(Uri.fromParts("package", ri.activityInfo.packageName, null)) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET); - startActivityAsUser(in, new UserHandle(UserHandle.getUserId(mLaunchedFromUid))); + startActivity(in); } private final class DisplayResolveInfo { @@ -436,10 +435,9 @@ public class ResolverActivity extends AlertActivity implements AdapterView.OnIte if (mBaseResolveList != null) { mCurrentResolveList = mBaseResolveList; } else { - mCurrentResolveList = mPm.queryIntentActivitiesAsUser( + mCurrentResolveList = mPm.queryIntentActivities( mIntent, PackageManager.MATCH_DEFAULT_ONLY - | (mAlwaysUseOption ? PackageManager.GET_RESOLVED_FILTER : 0), - UserHandle.getUserId(mLaunchedFromUid)); + | (mAlwaysUseOption ? PackageManager.GET_RESOLVED_FILTER : 0)); // Filter out any activities that the launched uid does not // have permission for. We don't do this when we have an explicit // list of resolved activities, because that only happens when diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index 0d9cf9ac4d27..6c5ed7e4933e 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -375,31 +375,31 @@ public class LockPatternView extends View { } private void notifyCellAdded() { + sendAccessEvent(R.string.lockscreen_access_pattern_cell_added); if (mOnPatternListener != null) { mOnPatternListener.onPatternCellAdded(mPattern); } - sendAccessEvent(R.string.lockscreen_access_pattern_cell_added); } private void notifyPatternStarted() { + sendAccessEvent(R.string.lockscreen_access_pattern_start); if (mOnPatternListener != null) { mOnPatternListener.onPatternStart(); } - sendAccessEvent(R.string.lockscreen_access_pattern_start); } private void notifyPatternDetected() { + sendAccessEvent(R.string.lockscreen_access_pattern_detected); if (mOnPatternListener != null) { mOnPatternListener.onPatternDetected(mPattern); } - sendAccessEvent(R.string.lockscreen_access_pattern_detected); } private void notifyPatternCleared() { + sendAccessEvent(R.string.lockscreen_access_pattern_cleared); if (mOnPatternListener != null) { mOnPatternListener.onPatternCleared(); } - sendAccessEvent(R.string.lockscreen_access_pattern_cleared); } /** @@ -799,9 +799,7 @@ public class LockPatternView extends View { } private void sendAccessEvent(int resId) { - setContentDescription(mContext.getString(resId)); - sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED); - setContentDescription(null); + announceForAccessibility(mContext.getString(resId)); } private void handleActionUp(MotionEvent event) { diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 2a02f7c82eba..5d6f73849b8c 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -20,6 +20,7 @@ #include "SkCanvas.h" #include "SkDevice.h" +#include "SkDrawFilter.h" #include "SkGraphics.h" #include "SkImageRef_GlobalPool.h" #include "SkPorterDuff.h" @@ -784,7 +785,15 @@ public: #define kStdUnderline_Thickness (1.0f / 18.0f) static void doDrawTextDecorations(SkCanvas* canvas, jfloat x, jfloat y, jfloat length, SkPaint* paint) { - uint32_t flags = paint->getFlags(); + uint32_t flags; + SkDrawFilter* drawFilter = canvas->getDrawFilter(); + if (drawFilter) { + SkPaint paintCopy(*paint); + drawFilter->filter(&paintCopy, SkDrawFilter::kText_Type); + flags = paintCopy.getFlags(); + } else { + flags = paint->getFlags(); + } if (flags & (SkPaint::kUnderlineText_Flag | SkPaint::kStrikeThruText_Flag)) { SkScalar left = SkFloatToScalar(x); SkScalar right = SkFloatToScalar(x + length); diff --git a/core/res/res/drawable-hdpi/stat_notify_rssi_in_range.png b/core/res/res/drawable-hdpi/stat_notify_rssi_in_range.png Binary files differnew file mode 100644 index 000000000000..74977e6aefff --- /dev/null +++ b/core/res/res/drawable-hdpi/stat_notify_rssi_in_range.png diff --git a/core/res/res/drawable-mdpi/stat_notify_rssi_in_range.png b/core/res/res/drawable-mdpi/stat_notify_rssi_in_range.png Binary files differnew file mode 100644 index 000000000000..62e4fe94a35c --- /dev/null +++ b/core/res/res/drawable-mdpi/stat_notify_rssi_in_range.png diff --git a/core/res/res/drawable-nodpi/kg_widget_overscroll_layer_left.9.png b/core/res/res/drawable-nodpi/kg_widget_overscroll_layer_left.9.png Binary files differdeleted file mode 100644 index c30eb1c6983f..000000000000 --- a/core/res/res/drawable-nodpi/kg_widget_overscroll_layer_left.9.png +++ /dev/null diff --git a/core/res/res/drawable-nodpi/kg_widget_overscroll_layer_right.9.png b/core/res/res/drawable-nodpi/kg_widget_overscroll_layer_right.9.png Binary files differdeleted file mode 100644 index e5d577171884..000000000000 --- a/core/res/res/drawable-nodpi/kg_widget_overscroll_layer_right.9.png +++ /dev/null diff --git a/core/res/res/drawable-xhdpi/stat_notify_rssi_in_range.png b/core/res/res/drawable-xhdpi/stat_notify_rssi_in_range.png Binary files differnew file mode 100644 index 000000000000..c0586d8bc21e --- /dev/null +++ b/core/res/res/drawable-xhdpi/stat_notify_rssi_in_range.png diff --git a/core/res/res/layout-land/keyguard_host_view.xml b/core/res/res/layout-land/keyguard_host_view.xml index ac943cbf5baf..10034de03db1 100644 --- a/core/res/res/layout-land/keyguard_host_view.xml +++ b/core/res/res/layout-land/keyguard_host_view.xml @@ -29,6 +29,7 @@ <include layout="@layout/keyguard_widget_region" android:layout_width="0dp" + android:layout_height="match_parent" android:layout_weight=".45" /> <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper diff --git a/core/res/res/layout-xlarge/breadcrumbs_in_fragment.xml b/core/res/res/layout-xlarge/breadcrumbs_in_fragment.xml index 0fb3443e5602..8e86427ee830 100644 --- a/core/res/res/layout-xlarge/breadcrumbs_in_fragment.xml +++ b/core/res/res/layout-xlarge/breadcrumbs_in_fragment.xml @@ -15,6 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+android:id/breadcrumb_section" android:orientation="vertical" android:layout_height="wrap_content" android:layout_width="match_parent" diff --git a/core/res/res/layout/action_bar_title_item.xml b/core/res/res/layout/action_bar_title_item.xml index 3ac0e210b2ef..df773eb5ee64 100644 --- a/core/res/res/layout/action_bar_title_item.xml +++ b/core/res/res/layout/action_bar_title_item.xml @@ -42,7 +42,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/action_bar_subtitle_top_margin" - android:layout_marginBottom="@dimen/action_bar_subtitle_bottom_margin" android:singleLine="true" android:ellipsize="end" android:visibility="gone" /> diff --git a/core/res/res/layout/keyguard_multi_user_avatar.xml b/core/res/res/layout/keyguard_multi_user_avatar.xml index df3ee00819a5..d6a858f16db0 100644 --- a/core/res/res/layout/keyguard_multi_user_avatar.xml +++ b/core/res/res/layout/keyguard_multi_user_avatar.xml @@ -22,6 +22,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="125dp" android:layout_height="125dp" + android:background="#000000" android:gravity="center_horizontal"> <ImageView android:id="@+id/keyguard_user_avatar" @@ -29,12 +30,23 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center"/> - <TextView - android:id="@+id/keyguard_user_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|right" - android:textSize="12sp" - android:background="#99FFFFFF" - android:textColor="#ff000000"/> -</com.android.internal.policy.impl.keyguard.KeyguardMultiUserAvatar> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + <Space + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="0.78" /> + <TextView + android:id="@+id/keyguard_user_name" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="0.22" + android:paddingLeft="6dp" + android:layout_gravity="center_vertical|left" + android:textSize="16sp" + android:textColor="#ffffff" + android:background="#808080" /> + </LinearLayout> +</com.android.internal.policy.impl.keyguard.KeyguardMultiUserAvatar>
\ No newline at end of file diff --git a/core/res/res/layout/keyguard_multi_user_selector.xml b/core/res/res/layout/keyguard_multi_user_selector.xml index c599fd5ddbfc..5a6e9989c140 100644 --- a/core/res/res/layout/keyguard_multi_user_selector.xml +++ b/core/res/res/layout/keyguard_multi_user_selector.xml @@ -21,7 +21,8 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_gravity="center"> + android:layout_gravity="center" + android:contentDescription="@string/keyguard_accessibility_user_selector"> <com.android.internal.policy.impl.keyguard.KeyguardSubdivisionLayout android:id="@+id/keyguard_users_grid" diff --git a/core/res/res/layout/keyguard_multi_user_selector_widget.xml b/core/res/res/layout/keyguard_multi_user_selector_widget.xml index c00089cf1478..ad9fdfee4849 100644 --- a/core/res/res/layout/keyguard_multi_user_selector_widget.xml +++ b/core/res/res/layout/keyguard_multi_user_selector_widget.xml @@ -20,6 +20,7 @@ <!-- This is a view that shows general status information in Keyguard. --> <com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/keyguard_multi_user_selector" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/core/res/res/layout/keyguard_status_view.xml b/core/res/res/layout/keyguard_status_view.xml index dc596f935d92..c7f6863317f1 100644 --- a/core/res/res/layout/keyguard_status_view.xml +++ b/core/res/res/layout/keyguard_status_view.xml @@ -29,7 +29,8 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:gravity="center_horizontal"> + android:gravity="center_horizontal" + android:contentDescription="@string/keyguard_accessibility_status"> <com.android.internal.policy.impl.keyguard.ClockView android:id="@+id/clock_view" diff --git a/core/res/res/layout/keyguard_transport_control_view.xml b/core/res/res/layout/keyguard_transport_control_view.xml index c40aa66da93c..5a6083a2c084 100644 --- a/core/res/res/layout/keyguard_transport_control_view.xml +++ b/core/res/res/layout/keyguard_transport_control_view.xml @@ -26,7 +26,8 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:foreground="@drawable/ic_lockscreen_player_background"> + android:foreground="@drawable/ic_lockscreen_player_background" + android:contentDescription="@string/keygaurd_accessibility_media_controls"> <!-- Use ImageView for its cropping features; otherwise could be android:background --> <ImageView android:id="@+id/albumart" diff --git a/core/res/res/layout/keyguard_widget_region.xml b/core/res/res/layout/keyguard_widget_region.xml index 42bf42b228b1..01b5551d8876 100644 --- a/core/res/res/layout/keyguard_widget_region.xml +++ b/core/res/res/layout/keyguard_widget_region.xml @@ -32,16 +32,14 @@ android:layout_weight="1" android:clipChildren="false" android:clipToPadding="false"> - <!-- TODO: Remove this when supported as a widget --> - <include layout="@layout/keyguard_status_view"/> - <include layout="@layout/keyguard_transport_control_view"/> </com.android.internal.policy.impl.keyguard.KeyguardWidgetPager> <LinearLayout android:layout_width="match_parent" android:layout_height="10dp" android:orientation="horizontal" android:paddingLeft="@dimen/kg_widget_pager_horizontal_padding" - android:paddingRight="@dimen/kg_widget_pager_horizontal_padding"> + android:paddingRight="@dimen/kg_widget_pager_horizontal_padding" + android:layout_marginTop="@dimen/kg_runway_lights_top_margin"> <com.android.internal.policy.impl.keyguard.KeyguardGlowStripView android:id="@+id/left_strip" android:paddingTop="@dimen/kg_runway_lights_vertical_padding" @@ -69,4 +67,4 @@ prvandroid:leftToRight="true" prvandroid:glowDot="@*android:drawable/ic_lockscreen_glowdot" /> </LinearLayout> -</com.android.internal.policy.impl.keyguard.KeyguardWidgetRegion>
\ No newline at end of file +</com.android.internal.policy.impl.keyguard.KeyguardWidgetRegion> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index 48f0cf9fc798..d1b042a61fe8 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Laat die program toe om die interne status van die stelsel op te haal. Kwaadwillige programme kan \'n verskeidenheid privaat en beveiligde inligting ophaal wat hulle gewoonlik nooit nodig het nie."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"haal skerminhoud op"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Laat die program toe om die inhoud van die aktiewe venster op te haal. Kwaadwillige programme kan die hele venster se inhoud ophaal, en al die teks ondersoek, behalwe wagwoorde."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"aktiveer toeganklikheid tydelik"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Laat \'n program toe om toeganklikheid tydelik op die toestel te aktiveer. Kwaadwillige programme kan sonder toestemming van die gebruiker toeganklikheid verkry."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"haal vensterinligting op"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Laat \'n program toe om inligting oor vensters vanaf die vensterbestuurder op te haal. Kwaadwillige programme kan moontlik inligting ophaal wat vir interne stelselgebruik bedoel is."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filter gebeure"</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Patroon uitgevee"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Sel bygevoeg"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Patroon klaar"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Legstuk %2$d van %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Gebruikerkieser"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Status"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Media-kontroles"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1094,18 +1096,19 @@ <string name="wifi_p2p_to_message" msgid="248968974522044099">"Aan:"</string> <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Voer die vereiste PIN in:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> - <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"Die telefoon sal tydelik van Wi-Fi ontkoppel terwyl dit aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gekoppel is"</string> + <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"Die foon sal tydelik van Wi-Fi ontkoppel terwyl dit aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gekoppel is"</string> <string name="select_character" msgid="3365550120617701745">"Voeg karakter in"</string> <string name="sms_control_title" msgid="7296612781128917719">"Stuur SMS-boodskappe"</string> <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> stuur \'n groot aantal SMS-boodskappe. Wil jy hierdie program toelaat om voort te gaan om boodskappe te stuur?"</string> <string name="sms_control_yes" msgid="3663725993855816807">"Laat toe"</string> <string name="sms_control_no" msgid="625438561395534982">"Weier"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> wil \'n boodskap na <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> stuur."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Dit kan onkoste op jou selfoonrekening veroorsaak."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Dit sal onkoste op jou selfoonrekening veroorsaak."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Hierdie "<font fgcolor="#ffffb060">"kan heffings veroorsaak"</font>" op jou selfoonrekening."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Dit sal heffings op jou selfoonrekening veroorsaak."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Stuur"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Kanselleer"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Onthou my keuse"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Jy kan dit later verander in Instellings > Programme"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Laat altyd toe"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Moet nooit toelaat nie"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kaart verwyder"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Foon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Oorfone"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dokluidsprekers"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-klank"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Stelsel"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-oudio"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Klaar"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Media-uitvoer"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Skandeer tans..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Koppel tans..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Beskikbaar"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Nie beskikbaar nie"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Ingeboude skerm"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI-skerm"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Oorlegger #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Voer SIM-PIN in"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Voer PIN in"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Voer wagwoord in"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK-kode"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Nuwe PIN-kode"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM is nou gedeaktiveer. Voer PUK-kode in om voort te gaan. Kontak diensverskaffer vir details."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Voer die gewenste PIN-kode in"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Bevestig gewenste PIN-kode"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Ontsluit tans SIM-kaart…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Verkeerde PIN-kode."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Tik \'n PIN in wat 4 tot 8 syfers lank is."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Tik \'n PUK in wat 8 syfers of meer is."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Voer PUK en nuwe PIN-kode in"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Jy het die verkeerde PUK getik."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK-kode moet 8 of meer syfers wees."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Voer weer die korrekte PUK-kode in. Herhaalde pogings sal die SIM permanent deaktiveer."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-kodes stem nie ooreen nie"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Te veel patroonpogings"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Om te ontsluit, meld met jou Google-rekening aan."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Gebruikernaam (e-pos)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Meld aan"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Ongeldige gebruikernaam of wagwoord."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Het jy jou gebruikernaam of wagwoord vergeet?"\n"Besoek "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Kontroleer tans..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Ontsluit tans SIM..."</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Jy het jou PIN <xliff:g id="NUMBER_0">%d</xliff:g> keer verkeerd ingetik. "\n\n"Probeer weer oor <xliff:g id="NUMBER_1">%d</xliff:g> sekondes."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Jy het <xliff:g id="NUMBER_0">%d</xliff:g> keer jou wagwoord verkeerdelik getik. "\n\n"Probeer weer oor <xliff:g id="NUMBER_1">%d</xliff:g> sekondes."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Jy het jou ontsluitpatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer verkeerdelik geteken. "\n\n"Probeer weer oor <xliff:g id="NUMBER_1">%d</xliff:g> sekondes."</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Jy het jou ontsluitpatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer verkeerdelik geteken. Na nog <xliff:g id="NUMBER_1">%d</xliff:g> onsuksesvolle pogings, sal jy gevra word om jou tablet te ontsluit deur middel van \'n e-posrekening."\n\n" Probeer weer oor <xliff:g id="NUMBER_2">%d</xliff:g> sekondes."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Jy het jou ontsluitpatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer verkeerdelik geteken. Na nog <xliff:g id="NUMBER_1">%d</xliff:g> onsuksesvolle pogings, sal jy gevra word om jou foon te ontsluit deur middel van \'n e-posrekening."\n\n" Probeer weer oor <xliff:g id="NUMBER_2">%d</xliff:g> sekondes."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Moet volume bo veilige vlak verhoog word?"\n"Deur vir lang tydperke op hoë volume te luister, kan jou gehoor beskadig."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"Hou aan om met twee vingers te hou om toeganklikheid te aktiveer."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"Toeganklikheid geaktiveer."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Toeganklikheid gekanselleer."</string> + <string name="user_switched" msgid="3768006783166984410">"Huidige gebruiker <xliff:g id="NAME">%1$s</xliff:g> ."</string> </resources> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 8ed4adbae1ec..f9b7c57a4d78 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"የስርዓቱን ውስጣዊ ሁናቴ ለመበርበር ለመተግበሪያው ይፈቅዳሉ፡፡ በተለምዶ የማያስፈልጋቸውን ብዙ አይነት የግል እና የደህንነት መረጃዎችን ተንኮል አዘል መተግበሪያዎች ሊበረብሩ ይችላሉ፡፡"</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"የማያ ይዘት ሰርስረህ አውጣ"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"የነቃ መስኮት ይዘትን ለመበርበር ለመተግበሪያው ይፈቅዳሉ፡፡ ጠቅላላውን የመስኮት ይዘት ለመበርበር እና ከይለፍ ቃል በስተቀር ሁሉንም ጽሑፉን ለማየት ጎጂ መተግበሪያዎች ይችላሉ፡፡"</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"ተደራሽነት በጊዜያዊነት ያነቃል"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"አንድ መተግበሪያ በጊዜያዊነት በመሣሪያው ላይ ተደራሽነትን እንዲያነቃ ያስችለዋል። ተንኮል-አዘል መተግበሪያዎች ያለተጠቃሚው ፍቃድ ተደራሽነትን ሊያነቁ ይችላሉ።"</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"የመስኮት መረጃን አምጣ"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"አንድ መተግበሪያ ከመስኮት አቀናባሪው ሆኖ ስለመስኮቱ መረጃ እንዲያመጣ ያስችለዋል። ተንኮል-አዘል መተግበሪያዎች ለውስጣዊ ስርዓት ጥቅም የታሰበ መረጃን ሊወስዱ ይችላሉ።"</string> <string name="permlab_filter_events" msgid="8675535648807427389">"ክስተቶችን አጣራ"</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"ንድፍ ጸድቷል"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"ሕዋስ ታክሏል"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"ንድፍ ተጠናቋል"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s። ምግብር %2$d ከ%3$d።"</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"ተጠቃሚ መራጭ"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"ሁኔታ"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"የሚዲያ መቆጣጠሪያዎች"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1094,18 +1096,19 @@ <string name="wifi_p2p_to_message" msgid="248968974522044099">"ለ፦"</string> <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"የሚፈለገውን ፒን ተይብ፦"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"ፒን፦"</string> - <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"ስልኩ ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ተገናኝቶ ባለበት ጊዜ በጊዜያዊነት ከWi-Fi ጋር ይላቀቃል"</string> + <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"ስልኩ ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ተገናኝቶ ባለበት ጊዜ በጊዜያዊነት ከWi-Fi ጋር ያለው ግንኙነት ይቋረጣል"</string> <string name="select_character" msgid="3365550120617701745">"ቁምፊ አስገባ"</string> <string name="sms_control_title" msgid="7296612781128917719">"የSMS መልዕክቶች መበላክ ላይ"</string> <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ቁጥራቸው ብዙ የሆኑ የኤስ.ኤም.ኤስ. መልዕክቶችን እየላከ ነው። ይሄ መተግበሪያ መልዕክቶችን መላኩን እንዲቀጥል መፍቀድ ትፈልጋለህ?"</string> <string name="sms_control_yes" msgid="3663725993855816807">"ፍቀድ"</string> <string name="sms_control_no" msgid="625438561395534982">"ከልክል"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ለ<b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> መልዕክት ለመላክ ይፈልጋል።"</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"ይሄ በተንቀሳቃሽ ስልክ መለያዎ ላይ ክፍያዎችን ሊያስከፍል ይችላል።"</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"ይሄ በተንቀሳቃሽ ስልክ መለያዎ ላይ ክፍያዎችን ያስከፍላል።"</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"ይሄ በተንቀሳቃሽ ስልክ መለያዎ ላይ "<font fgcolor="#ffffb060">"ክፍያዎችን ሊያስከትል ይችላል"</font>"።"</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"ይሄ በተንቀሳቃሽ ስልክ መለያዎ ላይ ክፍያዎችን ያስከትላል።"</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"ላክ"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"ሰርዝ"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"ምርጫዬን አስታውስ"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"ይሄንን በኋላ ላይ በቅንብሮች > መተግበሪያዎች ውስጥ ሊቀይሩት ይችላሉ"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"ሁልጊዜ ፍቀድ"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"በጭራሽ አትፍቀድ"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM ካርድ ተወግዷል"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"ስልክ"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"የጆሮ ማዳመጫዎች"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"የትከል ድምፅ ማጉያዎች"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI ድምጽ"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"ስርዓት"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"የብሉቱዝ ድምጽ"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"ተከናውኗል"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"የሚዲያ ውጽዓት"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"በመቃኘት ላይ..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"በማገናኘት ላይ..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"የሚገኙ"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"አይገኝም"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"ውስጥ የተሰራ ማያ ገጽ"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI ማያ ገጽ"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"ተደራቢ #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"የሲም ፒን ያስገቡ"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"ፒን ያስገቡ"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"የይለፍ ቃል ያስገቡ"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"የPUK ኮድ"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"አዲስ ፒን ኮድ"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"ሲም አሁን ተሰናክሏል። ለመቀጠል የPUK ኮድ ያስገቡ። ለዝርዝር ድምጸ ተያያዥ ሞደምን ያግኙ።"</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"የተፈለገውን የፒን ኮድ ያስገቡ"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"የተፈለገውን የፒን ኮድ ያረጋግጡ"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"ሲም ካርዱን በመክፈት ላይ…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"ትክክል ያልሆነ ፒን ኮድ።"</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"ከ4 እስከ 8 ቁጥሮች የያዘ ፒን ይተይቡ።"</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"8 ወይም ከዚያ በላይ ቁጥሮችን የሆነ PUK ይተይቡ።"</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"PUK እና አዲስ ፒን ይተይቡ"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"የተየቡት PUK ትክክል አይደለም።"</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"የPUK ኮድ 8 ወይም ከዚያ በላይ ቁጥሮች ሊኖረው ይገባል።"</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"ትክክለኛውን የPUK ኮድ እንደገና ያስገቡ። ተደጋጋሚ ሙከራዎች ሲም ካርዱን እስከመጨረሻው ያሰናክሉታል።"</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"ፒን ኮዶች አይገጣጠሙም"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"በጣም ብዙ የስርዓተ ጥለት ሙከራዎች"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"ለመክፈት በGoogle መለያዎ ይግቡ።"</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"የተጠቃሚ ስም (ኢሜይል)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"ግባ"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"ልክ ያልሆነ የተጠቃሚ ስም ወይም የይለፍ ቃል።"</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"የተጠቃሚ ስምዎን ወይም የይለፍ ቃልዎን ረሱት?"\n<b>"google.com/accounts/recovery"</b>"ይጎብኙ።"</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"በማረጋገጥ ላይ…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"ሲም በመክፈት ላይ…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"ፒንዎን <xliff:g id="NUMBER_0">%d</xliff:g> ጊዜ በትክክል አልተየቡም። "\n\n"በ<xliff:g id="NUMBER_1">%d</xliff:g> ሰኮንዶች ውስጥ እንደገና ይሞክሩ።"</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"የይለፍ ቃልዎን <xliff:g id="NUMBER_0">%d</xliff:g> ጊዜ ትክክል ባልሆነ መንገድ ተይበዋል።"\n\n"በ<xliff:g id="NUMBER_1">%d</xliff:g> ሰኮንዶች ውስጥ እንደገና ይሞክሩ።"</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"የመክፈቻ ስርዓተ ጥለትዎን <xliff:g id="NUMBER_0">%d</xliff:g> ጊዜ በትክክል አልሳሉትም። "\n\n" ከ<xliff:g id="NUMBER_1">%d</xliff:g> ሰከንዶች በኋላ እንደገና ይሞክሩ።"</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"የመክፈቻ ስርዓተ ጥለቱን <xliff:g id="NUMBER_0">%d</xliff:g> ጊዜ በትክክል አልሳሉትም። ከ<xliff:g id="NUMBER_1">%d</xliff:g> ተጨማሪ ያልተሳኩ ሙከራዎች በኋላ የኢሜይል መለያ ተጠቅመው ጡባዊ ቱኮዎን እንዲከፍቱ ይጠየቃሉ።"\n\n" ከ<xliff:g id="NUMBER_2">%d</xliff:g> ከሰከንዶች በኋላ እንደገና ይሞክሩ።"</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"የመክፈቻ ስርዓተ ጥለቱን <xliff:g id="NUMBER_0">%d</xliff:g> ጊዜ በትክክል አልሳሉትም። ከ<xliff:g id="NUMBER_1">%d</xliff:g> ተጨማሪ ያልተሳኩ ሙከራዎች በኋላ የኢሜይል መለያ ተጠቅመው ስልክዎን እንዲከፍቱ ይጠየቃሉ።"\n\n"እባክዎ ከ<xliff:g id="NUMBER_2">%d</xliff:g> ሰከንዶች በኋላ እንደገና ይሞክሩ።"</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"ድምጽ አደጋ ከሌለው መጠን በላይ ይጨመር??"\n"ለረጅም ጊዜ በከፍተኛ ድምጽ መስማት የመስማት ችሎታዎን ሊጎዳይ ይችላል።"</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"ተደራሽነትን ለማንቃት ሁለት ጣቶችዎን ባሉበት ያቆዩዋቸው።"</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"ተደራሽነት ነቅቷል።"</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"ተደራሽነት ተሰርዟል።"</string> + <string name="user_switched" msgid="3768006783166984410">"የአሁኑ ተጠቃሚ <xliff:g id="NAME">%1$s</xliff:g>።"</string> </resources> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 14ed551057ef..6a17465cde64 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"للسماح للتطبيق باسترداد الحالة الداخلية للنظام. قد تسترد التطبيقات الضارة مجموعة كبيرة من المعلومات الخاصة والآمنة التي لا حاجة لها في العادة على الإطلاق."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"استرداد محتوى الشاشة"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"للسماح للتطبيق باسترداد محتوى النافذة النشطة. يمكن للبرامج الضارة استرداد محتوى النافذة بالكامل وفحص جميع النصوص الموجودة بها باستثناء كلمات المرور."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"تمكين إمكانية الدخول مؤقتًا"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"يتيح لتطبيق تمكين إمكانية الدخول مؤقتًا بالجهاز. قد تتيح التطبيقات الضارة تمكين إمكانية الدخول بدون موافقة المستخدم."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"استرداد معلومات النوافذ"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"للسماح لأحد التطبيقات باستعادة معلومات حول النوافذ من مدير النوافذ. يمكن أن تستعيد التطبيقات الضارة معلومات الغرض منها استخدام النظام الداخلي."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"تصفية الأحداث"</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"تم محو النمط"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"تمت إضافة الخلية"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"اكتمل النمط"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. الأداة %2$d من %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"محدد المستخدم"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"الحالة"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"أدوات التحكم في الوسائط"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ب ت ث"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1103,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"السماح"</string> <string name="sms_control_no" msgid="625438561395534982">"رفض"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"هناك رغبة من <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> في إرسال رسالة إلى <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"قد يتسبب هذا في تحميل رسوم على حساب جوالك."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"سوف يتسبب هذا في تحميل رسوم على حساب جوالك."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"هذا "<font fgcolor="#ffffb060">"قد يؤدي إلى فرض رسوم"</font>" على حسابك على الجوال."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"سيؤدي هذا إلى فرض رسوم على حسابك على الجوال."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"إرسال"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"إلغاء"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"تذكر اختياري"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"يمكنك تغيير ذلك لاحقًا من إعدادات > تطبيقات"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"السماح دومًا"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"عدم السماح مطلقًا"</string> <string name="sim_removed_title" msgid="6227712319223226185">"تمت إزالة بطاقة SIM"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"الهاتف"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"سماعات رأس"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"مكبرات صوت للإرساء"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"صوت HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"النظام"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"صوت بلوتوث"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"تم"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"المنفذ الإعلامي"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"جارٍ الفحص..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"جارٍ الاتصال..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"متاح"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"غير متاح"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"شاشة مدمجة"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"شاشة HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"المركب #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"أدخل رقم التعريف الشخصي لبطاقة SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"أدخل رقم التعريف الشخصي"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"أدخل كلمة المرور"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"رمز PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"رمز رقم التعريف الشخصي الجديد"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"بطاقة SIM معطلة الآن. أدخل رمز PUK للمتابعة. اتصل بمشغل شبكة الجوال للاطلاع على التفاصيل."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"إدخال رمز رقم التعريف الشخصي المراد"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"تأكيد رمز رقم التعريف الشخصي المراد"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"جارٍ إلغاء تأمين بطاقة SIM…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"رقم التعريف الشخصي غير صحيح."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"اكتب رقم التعريف الشخصي المكون من 4 إلى 8 أرقام."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"اكتب رمز PUK المكون من 8 أرقام أو أكثر."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"اكتب رمز PUK ورمز رقم التعريف الشخصي الجديد"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"رمز PUK الذي كتبته غير صحيح."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"يجب أن يتضمن رمز PUK 8 أرقام أو أكثر."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"أعد إدخال رمز PUK الصحيح. وستؤدي المحاولات المتكررة إلى تعطيل بطاقة SIM نهائيًا."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"لا يتطابق رمزا رقم التعريف الشخصي"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"محاولات النقش كثيرة جدًا"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"لإلغاء التأمين، سجّل الدخول بحسابك في Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"اسم المستخدم (البريد إلكتروني)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"تسجيل الدخول"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"اسم مستخدم غير صحيح أو كلمة مرور غير صالحة."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"هل نسيت اسم المستخدم أو كلمة المرور؟"\n"انتقل إلى "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"جارٍ التحقق…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"جارٍ إلغاء قفل بطاقة SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"لقد كتبت رقم التعريف الشخصي بشكل غير صحيح <xliff:g id="NUMBER_0">%d</xliff:g> مرة. "\n\n"أعد المحاولة خلال <xliff:g id="NUMBER_1">%d</xliff:g> ثانية."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"لقد كتبت كلمة المرور بشكل غير صحيح <xliff:g id="NUMBER_0">%d</xliff:g> مرة. "\n\n"أعد المحاولة خلال <xliff:g id="NUMBER_1">%d</xliff:g> ثانية."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"لقد رسمت نقش إلغاء التأمين بطريقة غير صحيحة <xliff:g id="NUMBER_0">%d</xliff:g> مرة. "\n\n"أعد المحاولة خلال <xliff:g id="NUMBER_1">%d</xliff:g> ثانية."</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"لقد رسمت نقش إلغاء التأمين بشكل غير صحيح <xliff:g id="NUMBER_0">%d</xliff:g> مرة. بعد إجراء <xliff:g id="NUMBER_1">%d</xliff:g> من المحاولات غير الناجحة الأخرى، ستطالَب بإلغاء تأمين الجهاز اللوحي باستخدام معلومات حساب بريد إلكتروني."\n\n" أعد المحاولة خلال <xliff:g id="NUMBER_2">%d</xliff:g> ثانية."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"لقد رسمت نقش إلغاء التأمين بشكل غير صحيح <xliff:g id="NUMBER_0">%d</xliff:g> مرة. بعد إجراء <xliff:g id="NUMBER_1">%d</xliff:g> من المحاولات غير الناجحة الأخرى، ستُطالب بإلغاء تأمين الهاتف باستخدام حساب بريد إلكتروني لإلغاء تأمين الهاتف."\n\n" أعد المحاولة خلال <xliff:g id="NUMBER_2">%d</xliff:g> ثانية."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"هل تريد رفع مستوى الصوت فوق المستوى الآمن؟"\n"قد يضر سماع صوت عالٍ لفترات طويلة بسمعك."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"اضغط بإصبعين لأسفل مع الاستمرار لتمكين تسهيل الدخول."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"تم تمكين إمكانية الدخول."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"تم إلغاء تسهيل الدخول."</string> + <string name="user_switched" msgid="3768006783166984410">"المستخدم الحالي <xliff:g id="NAME">%1$s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 5a95d6cba1f0..4705a3311bce 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Дазваляе прыкладанням атрымліваць інфармацыю аб унутраным стане сістэмы. Шкоднасныя прыкладанні могуць атрымліваць шырокі спектр прыватных дадзеных і дадзеных, прызначаных для забеспячэння бяспекі інфармацыі, якія звычайна ім не патрэбны."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"атрыманне зместу экрана"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Дазваляе прыкладанням атрымліваць змесціва актыўнага акна. Шкоднасныя прыкладанні могуць атрымліваць усё змесціва акна і разглядаць увесь яго тэкст, акрамя пароляў."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"часова ўключыць даступнасць"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Дазваляе прыкладанню часова ўключаць даступнасць прылады. Шкоднасныя прыкладаннi могуць уключыць даступнасць без згоды карыстальніка."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"атрымаць звесткi пра акно"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Дазваляе прыкладанням вымаць iнфармацыю пра вокны з iнструмента кiравання вокнамi. Шкоднасныя прыкладаннi могуць вымаць iнфармацыю, якая прызначана для ўнутранага выкарыстання ў сiстэме."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"фільтр падзей"</string> @@ -813,6 +811,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Ключ выдалены"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Сотавы дададзены"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Ключ завершаны"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. ВIджэт %2$d з %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Селектар карыстальнiка"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Стан"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Налады мультымедыя"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"Alt"</string> @@ -1102,11 +1104,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Дазволіць"</string> <string name="sms_control_no" msgid="625438561395534982">"Забараніць"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> хоча адправiць паведамленне на адрас <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"У вашым улiковым запiсе можа спаганяцца дадатковая плата."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Можа спаганяцца плата ў вашым мабiльным улiковым запiсе."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Гэта "<font fgcolor="#ffffb060">"можа прывесцi да дадатковых выдаткаванняў"</font>" з вашага мабiльнага ўлiковага запiсу."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Гэта стане прычынай дадатковага спагнання сродкаў з вашага мабiльнага ўлiковага запiсу."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Адправiць"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Адмена"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Захаваць мой выбар"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Пазней гэта можна змянiць у раздзеле \"Налады > Прыкладаннi\""</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Заўсёды дазваляць"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Ніколі не дазваляць"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-карта выдаленая"</string> @@ -1366,11 +1369,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Тэлефон"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Навушнікі"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Дынамікі станцыi"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-аўдыёвыхад"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Сістэма"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-аўдыё"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Гатова"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Мультымедыйны выхад"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Сканiраванне..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Падключэнне..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Даступна"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Недаступны"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Убудаваны экран"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Экран HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Оверлей # <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1385,14 +1392,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Увядзіце PIN-код SIM-карты"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Увядзіце PIN-код"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Увядзіце пароль"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Новы PIN-код"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM-карта зараз адключана. Увядзіце PUK-код, каб працягнуць. Звяжыцеся са сваiм аператарам, каб атрымаць дадатковую iнфармацыю."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Увядзіце жаданы PIN-код"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Пацвердзіце жадан PIN-код"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Разблакiроўка SIM-карты..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Няправільны PIN-код."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Увядзіце PIN-код, які змяшчае ад 4 да 8 лічбаў."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Увядзіце PUK з 8 лічбаў ці больш."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Увядзіце PUK-код і новы PIN-код"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Няправільны PUK-код."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK-код павінен утрымлiваць 8 лiчбаў і больш."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Паўторна увядзіце правільны PUK-код. Неаднаразовыя спробы назаўжды адключаць SIM-карту."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-коды не супадаюць"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Занадта шмат спроб паўтарыць шаблон!"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Каб разблакiраваць, увайдзіце ў свой уліковы запіс Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Імя карыстальніка (электронная пошта)"</string> @@ -1400,7 +1408,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Увайсцi"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Няправільнае імя карыстальніка ці пароль."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Забыліся на імя карыстальніка або пароль?"\n"Наведайце "<b>"google.com/accounts/recovery"</b></string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Праверка..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Разблакiроўка SIM-карты..."</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Вы няправільна ўвялі PIN-код пэўную колькасць разоў: <xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n"Паўтарыце спробу праз <xliff:g id="NUMBER_1">%d</xliff:g> с."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Вы няправільна ўвялі пароль пэўную колькасць разоў: <xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n"Паўтарыце спробу праз <xliff:g id="NUMBER_1">%d</xliff:g> с."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Вы няправільна ўвялі графічны ключ разблакiроўкi пэўную колькасць разоў: <xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n"Паўтарыце спробу праз <xliff:g id="NUMBER_1">%d</xliff:g> с."</string> @@ -1411,12 +1419,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Вы няправільна ўвялі графічны ключ разблакiроўкi пэўную колькасць разоў: <xliff:g id="NUMBER_0">%d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%d</xliff:g>) вам будзе прапанавана разблакiраваць тэлефон, увайшоўшы ў Google."\n\n" Паўтарыце спробу праз <xliff:g id="NUMBER_2">%d</xliff:g> с."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Вы няправільна ўвялі графічны ключ разблакiроўкi пэўную колькасць разоў: <xliff:g id="NUMBER_0">%d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%d</xliff:g>) вам будзе прапанавана разблакiраваць тэлефон, увайшоўшы ў Google."\n\n" Паўтарыце спробу праз <xliff:g id="NUMBER_2">%d</xliff:g> с."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Павялiчыць гук больш за рэкамендаваны ўзровень?"\n"Доўгае слуханне музыкi на вялiкай гучнасцi можа пашкодзiць ваш слых."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"Утрымлiвайце два пальца, каб уключыць даступнасць."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"Даступнасць уключана."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Даступнасць адменена."</string> + <string name="user_switched" msgid="3768006783166984410">"Бягучы карыстальнік <xliff:g id="NAME">%1$s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 8c992c187768..5c7860cd435b 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Разрешава на приложението да извлича вътрешното състояние на системата. Злонамерените приложения могат да извлекат разнообразна частна и защитена информация, която нормално не би трябвало да им е нужна."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"извличане на съдържанието на екрана"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Разрешава на приложението да извлича съдържанието от активния прозорец. Злонамерените приложения могат да извлекат цялото му съдържание и да проследят целия текст в него освен паролите."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"временно активиране на достъпността"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Разрешава на приложението временно да активира достъпността на устройството. Злонамерените приложения може да я активират без съгласието на потребителя."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"извличане на информация за прозорците"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Разрешава на приложението да извлича информация за прозорците от съответния мениджър. Злонамерените приложения може да извличат данни, които са предназначени за вътрешно използване от системата."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"филтриране на събитията"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Фигурата е изчистена"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Клетката е добавена"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Фигурата е завършена"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"АБВ"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Разрешаване"</string> <string name="sms_control_no" msgid="625438561395534982">"Отказване"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> иска да изпрати съобщение до <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Това може да доведе до таксуване на мобилната ви сметка."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Това ще доведе до таксуване на мобилната ви сметка."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Изпращане"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Отказ"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Изборът ми да се запомни"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Винаги да се разрешава"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Никога да не се разрешава"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM картата е премахната"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Телефон"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Слушалки"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Докинг станц.: Високогов."</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI аудио"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Система"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Звук през Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Готово"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Изходяща мултимедия"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Вграден екран"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Екран „HDMI“"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Наслагване №<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Въведете ПИН кода за SIM картата"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Въведете ПИН код"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Въведете паролата"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK код"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Нов ПИН код"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM картата се отключва…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Неправилен ПИН код."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Въведете ПИН код с четири до осем цифри."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Въведете PUK код с поне осем цифри."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Въведете PUK и новия ПИН код"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Въведеният от вас PUK код е неправилен."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Опитите за фигурата са твърде много"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"За да отключите, влезте с профила си в Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Потребителско име (имейл)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Вход"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Невалидно потребителско име или парола."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Забравили сте потребителското име или паролата си?"\n"Посетете "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Проверява се…"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Въведохте неправилно ПИН кода си <xliff:g id="NUMBER_0">%d</xliff:g> пъти. "\n\n"Опитайте отново след <xliff:g id="NUMBER_1">%d</xliff:g> секунди."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Въведохте неправилно паролата си <xliff:g id="NUMBER_0">%d</xliff:g> пъти. "\n\n"Опитайте отново след <xliff:g id="NUMBER_1">%d</xliff:g> секунди."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Начертахте неправилно фигурата си за отключване <xliff:g id="NUMBER_0">%d</xliff:g> пъти. "\n\n"Опитайте отново след <xliff:g id="NUMBER_1">%d</xliff:g> секунди."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Начертахте неправилно фигурата си за отключване <xliff:g id="NUMBER_0">%d</xliff:g> пъти. След още <xliff:g id="NUMBER_1">%d</xliff:g> неуспешни опита ще бъдете помолени да отключите таблета посредством имейл адрес."\n\n" Опитайте отново след <xliff:g id="NUMBER_2">%d</xliff:g> секунди."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Начертахте неправилно фигурата си за отключване <xliff:g id="NUMBER_0">%d</xliff:g> пъти. След още <xliff:g id="NUMBER_1">%d</xliff:g> неуспешни опита ще бъдете помолени да отключите телефона посредством имейл адрес."\n\n" Опитайте отново след <xliff:g id="NUMBER_2">%d</xliff:g> секунди."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Да се увеличи ли силата на звука над безопасното ниво?"\n"Продължителното слушане при висока сила на звука може да увреди слуха ви."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Достъпността е активирана."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index d0e1e3cc6aa9..e53c05e838d7 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -155,8 +155,8 @@ <string name="global_action_lock" msgid="2844945191792119712">"Bloqueig de pantalla"</string> <string name="global_action_power_off" msgid="4471879440839879722">"Apaga"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Informe d\'error"</string> - <string name="bugreport_title" msgid="2667494803742548533">"Realització d\'informe d\'errors"</string> - <string name="bugreport_message" msgid="398447048750350456">"Es recopilarà informació sobre l\'estat actual del dispositiu per enviar-la com a missatge de correu electrònic. Passarà un cert temps a partir del moment en què comenci a elaborar-se l\'informe d\'errors fins que no estigui llest per enviar; tingues paciència."</string> + <string name="bugreport_title" msgid="2667494803742548533">"Crea informe d\'errors"</string> + <string name="bugreport_message" msgid="398447048750350456">"Es recopilarà informació sobre l\'estat actual del dispositiu, que s\'enviarà per correu electrònic. Passaran uns quants minuts des de l\'inici de l\'informe d\'errors fins al seu enviament, per la qual cosa et recomanem que tinguis paciència."</string> <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Mode silenciós"</string> <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"So desactivat"</string> <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"El so està activat"</string> @@ -272,7 +272,7 @@ <string name="permlab_setScreenCompatibility" msgid="6975387118861842061">"definició de la compatibilitat de pantalla"</string> <string name="permdesc_setScreenCompatibility" msgid="692043618693917374">"Permet que l\'aplicació controli el mode de compatibilitat de pantalla d\'altres aplicacions. És possible que les aplicacions malicioses interrompin el comportament d\'altres aplicacions."</string> <string name="permlab_setDebugApp" msgid="3022107198686584052">"activa la depuració d\'aplicacions"</string> - <string name="permdesc_setDebugApp" msgid="4474512416299013256">"Permet que una aplicació activi la depuració per a una altra aplicació. Les aplicacions malicioses poden utilitzar aquesta funció per finalitzar altres aplicacions."</string> + <string name="permdesc_setDebugApp" msgid="4474512416299013256">"Permet que l\'aplicació activi la depuració d\'altra aplicació. Les aplicacions malicioses poden utilitzar aquest permís per interrompre l\'execució d\'altres aplicacions."</string> <string name="permlab_changeConfiguration" msgid="4162092185124234480">"canvi de la configuració de pantalla del sistema"</string> <string name="permdesc_changeConfiguration" msgid="4372223873154296076">"Permet que una aplicació canviï la configuració actual, com ara la configuració regional o la mida global del tipus de lletra."</string> <string name="permlab_enableCarMode" msgid="5684504058192921098">"activar el mode de cotxe"</string> @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Permet que l\'aplicació recuperi l\'estat intern del sistema. Les aplicacions malicioses poden recuperar una àmplia gamma d\'informació privada i de seguretat que normalment no haurien de necessitar mai."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"recuperació del contingut de la pantalla"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Permet que l\'aplicació recuperi el contingut de la finestra activa. Les aplicacions malicioses poden recuperar el contingut de tota la finestra i examinar-ne tot el text, excepte les contrasenyes."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"activació temporal de l\'accessibilitat"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Permet que una aplicació activi temporalment l\'accessibilitat al dispositiu. És possible que les aplicacions malicioses activin l\'accessibilitat sense el consentiment de l\'usuari."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"recupera informació de les finestres"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Permet que una aplicació recuperi informació sobre les finestres del gestor de finestres. Aplicacions malicioses podrien recuperar informació dirigida a la utilització per part del sistema intern."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtra els esdeveniments"</string> @@ -344,7 +342,7 @@ <string name="permdesc_bindTextService" msgid="8151968910973998670">"Permet al titular vincular amb la interfície de nivell superior d\'un servei de text (per exemple, SpellCheckerService). Les aplicacions normals mai no ho haurien de necessitar."</string> <string name="permlab_bindVpnService" msgid="4708596021161473255">"vincula a un servei de VPN"</string> <string name="permdesc_bindVpnService" msgid="2067845564581693905">"Permet que el titular vinculi a la interfície de nivell superior d\'un servei de VPN. No s\'hauria de necessitar mai per a les aplicacions normals."</string> - <string name="permlab_bindWallpaper" msgid="8716400279937856462">"vincular a un empaperat"</string> + <string name="permlab_bindWallpaper" msgid="8716400279937856462">"enllaça amb un fons de pantalla"</string> <string name="permdesc_bindWallpaper" msgid="7108428692595491668">"Permet que el titular vinculi a la interfície de nivell superior d\'un fons de pantalla. No s\'hauria de necessitar mai per a les aplicacions normals."</string> <string name="permlab_bindRemoteViews" msgid="5697987759897367099">"vincula a un servei de widget"</string> <string name="permdesc_bindRemoteViews" msgid="4717987810137692572">"Permet que el titular vinculi a la interfície de nivell superior d\'un servei de widget. No s\'hauria de necessitar mai per a les aplicacions normals."</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Patró esborrat"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"S\'ha afegit una cel·la"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Patró completat"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Widget %2$d de %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Selector d\'usuaris"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Estat"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Controls multimèdia"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -886,9 +888,9 @@ <string name="searchview_description_clear" msgid="1330281990951833033">"Neteja la consulta"</string> <string name="searchview_description_submit" msgid="2688450133297983542">"Envia la consulta"</string> <string name="searchview_description_voice" msgid="2453203695674994440">"Cerca per veu"</string> - <string name="enable_explore_by_touch_warning_title" msgid="7460694070309730149">"Vols activar l\'Exploració per tacte?"</string> - <string name="enable_explore_by_touch_warning_message" product="tablet" msgid="8655887539089910577">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> vol activar l\'Exploració per tacte. Quan l\'Exploració per tacte està activada, pots escoltar o veure les descripcions del que hi ha sota el dit o fer gestos per interactuar amb la tauleta."</string> - <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> vol activar l\'Exploració per tacte. Quan l\'Exploració per tacte està activada, pots escoltar o veure les descripcions del que hi ha sota el dit o fer gestos per interactuar amb el telèfon."</string> + <string name="enable_explore_by_touch_warning_title" msgid="7460694070309730149">"Vols activar l\'exploració tàctil?"</string> + <string name="enable_explore_by_touch_warning_message" product="tablet" msgid="8655887539089910577">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> vol activar l\'exploració tàctil. Quan l\'exploració tàctil està activada, pots escoltar o veure les descripcions del contingut seleccionat o utilitzar gestos per interactuar amb la tauleta."</string> + <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> vol activar l\'exploració tàctil. Quan l\'exploració per tàctil està activada, pots escoltar o veure les descripcions del contingut seleccionat o utilitzar gestos per interactuar amb el telèfon."</string> <string name="oneMonthDurationPast" msgid="7396384508953779925">"Fa 1 mes"</string> <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Fa menys d\'1 mes"</string> <plurals name="num_seconds_ago"> @@ -1101,11 +1103,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Permet"</string> <string name="sms_control_no" msgid="625438561395534982">"Denega"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vol enviar un missatge a <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Això pot comportar càrrecs al teu compte de mòbil."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Això comportarà càrrecs al teu compte de mòbil."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Aquesta acció "<font fgcolor="#ffffb060">"pot fer que s\'apliquin càrrecs"</font>" al compte del mòbil."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Aquesta acció farà que s\'apliquin càrrecs al compte del mòbil."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Envia"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Cancel·la"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Recorda la meva selecció"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Pots canviar aquesta opció més endavant a Configuració > Aplicacions"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Permet sempre"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"No permetis mai"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Extracció de la targeta SIM"</string> @@ -1142,18 +1145,18 @@ <string name="dlg_confirm_kill_storage_users_text" msgid="5100428757107469454">"Si actives l\'emmagatzematge USB, algunes de les aplicacions que utilitzes s\'aturaran i pot ser que no estiguin disponibles fins que no desactivis l\'emmagatzematge USB."</string> <string name="dlg_error_title" msgid="7323658469626514207">"S\'ha produït un error amb l\'operació de l\'USB"</string> <string name="dlg_ok" msgid="7376953167039865701">"D\'acord"</string> - <string name="usb_mtp_notification_title" msgid="3699913097391550394">"Connectat com a dispositiu multimèdia"</string> + <string name="usb_mtp_notification_title" msgid="3699913097391550394">"Connectat com a disp. multimèdia"</string> <string name="usb_ptp_notification_title" msgid="1960817192216064833">"Connectat com a càmera"</string> <string name="usb_cd_installer_notification_title" msgid="6774712827892090754">"Connectat com a instal·lador"</string> <string name="usb_accessory_notification_title" msgid="7848236974087653666">"Connectat a un accessori USB"</string> - <string name="usb_notification_message" msgid="2290859399983720271">"Toca per obtenir altres opcions d\'USB."</string> + <string name="usb_notification_message" msgid="2290859399983720271">"Toca per accedir a altres opcions d\'USB."</string> <string name="extmedia_format_title" product="nosdcard" msgid="9020092196061007262">"Formata l\'emmagatzematge USB"</string> <string name="extmedia_format_title" product="default" msgid="3648415921526526069">"Vols formatar la targeta SD?"</string> <string name="extmedia_format_message" product="nosdcard" msgid="3934016853425761078">"S\'esborraran tots els fitxers emmagatzemats al dispositiu d\'emmagatzematge USB. Aquesta acció no es pot desfer."</string> <string name="extmedia_format_message" product="default" msgid="14131895027543830">"Es perdran totes les dades d\'aquesta targeta."</string> <string name="extmedia_format_button_format" msgid="4131064560127478695">"Formata"</string> - <string name="adb_active_notification_title" msgid="6729044778949189918">"Depuració d\'USB connectada"</string> - <string name="adb_active_notification_message" msgid="1016654627626476142">"Toca-ho per desactivar la depuració USB."</string> + <string name="adb_active_notification_title" msgid="6729044778949189918">"Depuració USB activada"</string> + <string name="adb_active_notification_message" msgid="1016654627626476142">"Toca per desactivar la depuració USB."</string> <string name="select_input_method" msgid="4653387336791222978">"Selecciona un mètodes d\'entrada"</string> <string name="configure_input_methods" msgid="9091652157722495116">"Configura els mètodes d\'entrada"</string> <string name="use_physical_keyboard" msgid="6203112478095117625">"Teclat físic"</string> @@ -1215,7 +1218,7 @@ <string name="sync_binding_label" msgid="3687969138375092423">"Sincronització"</string> <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibilitat"</string> <string name="wallpaper_binding_label" msgid="1240087844304687662">"Fons de pantalla"</string> - <string name="chooser_wallpaper" msgid="7873476199295190279">"Canvi de l\'empaperat"</string> + <string name="chooser_wallpaper" msgid="7873476199295190279">"Canvia el fons de pantalla"</string> <string name="vpn_title" msgid="19615213552042827">"VPN activada"</string> <string name="vpn_title_long" msgid="6400714798049252294">"<xliff:g id="APP">%s</xliff:g> ha activat VPN"</string> <string name="vpn_text" msgid="3011306607126450322">"Toca per gestionar la xarxa."</string> @@ -1275,7 +1278,7 @@ <string name="sync_undo_deletes" msgid="2941317360600338602">"Desfés les supressions"</string> <string name="sync_do_nothing" msgid="3743764740430821845">"No facis res per ara"</string> <string name="choose_account_label" msgid="5655203089746423927">"Tria un compte"</string> - <string name="add_account_label" msgid="2935267344849993553">"Addició d\'un compte"</string> + <string name="add_account_label" msgid="2935267344849993553">"Afegeix un compte"</string> <string name="add_account_button_label" msgid="3611982894853435874">"Afegeix un compte"</string> <string name="number_picker_increment_button" msgid="2412072272832284313">"Incrementa"</string> <string name="number_picker_decrement_button" msgid="476050778386779067">"Redueix"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telèfon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Auriculars"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altaveus del connector"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Àudio HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Àudio per Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Fet"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Sortida de contingut multimèdia"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"S\'està explorant..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"S\'està connectant..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Disponible"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"No disponible"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Pantalla integrada"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Pantalla HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Superposa #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Introdueix el PIN de la SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Introdueix el PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Introdueix la contrasenya"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Codi PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Codi PIN nou"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"La SIM està desactivada. Introdueix el codi PUK per continuar. Contacta amb l\'operador de telefonia mòbil per obtenir detalls."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Introdueix el codi PIN"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Confirma el codi PIN"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"S\'està desbloquejant la targeta SIM..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Codi PIN incorrecte."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Escriu un PIN que tingui de 4 a 8 números."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Introdueix un PUK que tingui com a mínim 8 números."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Introdueix el codi PUK i el codi PIN nou"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"El PUK que has escrit no és correcte."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"El codi PUK ha de tenir 8 números o més."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Torna a introduir el codi PUK correcte. Els intents repetits faran que es desactivi la SIM de manera permanent."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Els codis PIN no coincideixen"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Massa intents incorrectes"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Per desbloquejar el telèfon, inicia la sessió amb el compte de Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nom d\'usuari (correu electrònic)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Inicia la sessió"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nom d\'usuari o contrasenya no vàlids."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Has oblidat el teu nom d\'usuari o la contrasenya?"\n"Visita "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"S\'està comprovant..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"S\'està desbloquejant la targeta SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Has escrit malament el PIN <xliff:g id="NUMBER_0">%d</xliff:g> vegades. "\n\n"Torna-ho a provar d\'aquí a <xliff:g id="NUMBER_1">%d</xliff:g> segons."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Has escrit malament la contrasenya <xliff:g id="NUMBER_0">%d</xliff:g> vegades. "\n\n"Torna-ho a provar d\'aquí a <xliff:g id="NUMBER_1">%d</xliff:g> segons."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Has dibuixat el patró de desbloqueig de manera incorrecta <xliff:g id="NUMBER_0">%d</xliff:g> vegades. "\n\n"Torna-ho a provar d\'aquí a <xliff:g id="NUMBER_1">%d</xliff:g> segons."</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Has dibuixat el patró de desbloqueig <xliff:g id="NUMBER_0">%d</xliff:g> vegades de manera incorrecta. Després de <xliff:g id="NUMBER_1">%d</xliff:g> intents incorrectes més, se\'t demanarà que desbloquegis la tauleta amb un compte de correu electrònic."\n\n" Torna-ho a provar d\'aquí a <xliff:g id="NUMBER_2">%d</xliff:g> segons."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Has dibuixat el patró de desbloqueig <xliff:g id="NUMBER_0">%d</xliff:g> vegades de manera incorrecta. Després de <xliff:g id="NUMBER_1">%d</xliff:g> intents incorrectes més, se\'t demanarà que desbloquegis el telèfon amb un compte de correu electrònic."\n\n" Torna-ho a provar d\'aquí a <xliff:g id="NUMBER_2">%d</xliff:g> segons."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Vols augmentar el volum per sobre del nivell de seguretat?"\n"Escoltar música a un volum alt durant períodes llargs pot perjudicar l\'oïda."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"Mantén premuts els dos dits per activar l\'accessibilitat."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"S\'ha activat l\'accessibilitat."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibilitat cancel·lada."</string> + <string name="user_switched" msgid="3768006783166984410">"Usuari actual: <xliff:g id="NAME">%1$s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 8e05c03949f7..37a39a5996c3 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Umožňuje aplikaci získat informace o vnitřním stavu systému. Škodlivé aplikace mohou získat různé soukromé informace nebo informace o zabezpečení, které by běžně vůbec neměly potřebovat."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"načtení obsahu obrazovky"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Umožňuje aplikaci načíst obsah aktivního okna. Škodlivé aplikace mohou načíst obsah celého okna a prozkoumat všechen text kromě hesel."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"dočasná aktivace usnadnění přístupu"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Umožňuje aplikaci dočasně aktivovat usnadnění přístupu v zařízení. Škodlivé aplikace mohou usnadnění přístupu aktivovat bez souhlasu uživatele."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"načítání informací o oknech"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Umožňuje aplikaci načíst informace o oknech ze správce oken. Škodlivé aplikace mnohou načíst informace, které slouží k internímu systémovému využití."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrování událostí"</string> @@ -752,7 +750,7 @@ <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Nesprávný kód PIN."</string> <string name="keyguard_label_text" msgid="861796461028298424">"Chcete-li telefon odemknout, stiskněte Menu a poté 0."</string> <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"Číslo tísňové linky"</string> - <string name="lockscreen_carrier_default" msgid="8963839242565653192">"Žádný signál."</string> + <string name="lockscreen_carrier_default" msgid="8963839242565653192">"Žádný signál"</string> <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Obrazovka uzamčena."</string> <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Chcete-li odemknout telefon nebo provést tísňové volání, stiskněte Menu."</string> <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Telefon odemknete stisknutím tlačítka Menu."</string> @@ -767,7 +765,7 @@ <string name="lockscreen_charged" msgid="4938930459620989972">"nabito"</string> <string name="lockscreen_battery_short" msgid="4477264849386850266">"<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="lockscreen_low_battery" msgid="1482873981919249740">"Připojte dobíjecí zařízení."</string> - <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Není vložena SIM karta."</string> + <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Není vložena SIM karta"</string> <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"V tabletu není SIM karta."</string> <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"V telefonu není žádná SIM karta."</string> <string name="lockscreen_missing_sim_instructions" msgid="5372787138023272615">"Vložte SIM kartu."</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Bezpečnostní gesto vymazáno"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Buňka přidána"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Bezpečnostní gesto dokončeno"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"Alt"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Povolit"</string> <string name="sms_control_no" msgid="625438561395534982">"Odmítnout"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> chce odeslat zprávu na adresu <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Toto může vést k poplatkům na vašem mobilním účtu."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Toto povede k poplatkům na vašem mobilním účtu."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Odeslat"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Zrušit"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Zapamatovat moji volbu"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Povolit vždy"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Nepovolit nikdy"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM karta odebrána"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Sluchátka"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Reproduktory doku"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Zvuk HDMI"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Systém"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth Audio"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Hotovo"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Výstup médií"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Integrovaná obrazovka"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Obrazovka HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Překryvná vrstva č. <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Zadejte kód PIN SIM karty"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Zadejte kód PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Zadejte heslo"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Kód PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Nový kód PIN"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Odblokování SIM karty..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Nesprávný kód PIN."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Zadejte kód PIN o délce 4–8 číslic."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Zadejte osmimístný nebo delší kód PUK."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Zadejte kód PUK a nový kód PIN."</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Zadali jste nesprávný kód PUK."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Příliš mnoho pokusů o nakreslení gesta"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Chcete-li telefon odemknout, přihlaste se pomocí svého účtu Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Uživatelské jméno (e-mail)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Přihlásit se"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Neplatné uživatelské jméno nebo heslo."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Zapomněli jste uživatelské jméno nebo heslo?"\n"Přejděte na stránku "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Kontrola…"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Již <xliff:g id="NUMBER_0">%d</xliff:g>krát jste zadali nesprávný kód PIN. "\n\n"Zkuste to znovu za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Již <xliff:g id="NUMBER_0">%d</xliff:g>krát jste nesprávně zadali heslo. "\n\n"Zkuste to znovu za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Již <xliff:g id="NUMBER_0">%d</xliff:g>krát jste zadali nesprávné bezpečnostní gesto. "\n\n"Zkuste to znovu za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Již <xliff:g id="NUMBER_0">%d</xliff:g>krát jste nesprávně nakreslili své heslo odemknutí. Po <xliff:g id="NUMBER_1">%d</xliff:g>dalších neúspěšných pokusech budete požádáni o odemčení tabletu pomocí e-mailového účtu."\n\n" Zkuste to znovu za <xliff:g id="NUMBER_2">%d</xliff:g> s."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Již <xliff:g id="NUMBER_0">%d</xliff:g>krát jste nesprávně nakreslili své heslo odemknutí. Po <xliff:g id="NUMBER_1">%d</xliff:g> dalších neúspěšných pokusech budete požádáni o odemčení telefonu pomocí e-mailového účtu."\n\n" Zkuste to znovu za <xliff:g id="NUMBER_2">%d</xliff:g> s."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Chcete hlasitost zvýšit nad bezpečnou úroveň?"\n"Dlouhodobý poslech hlasitého zvuku může poškodit sluch."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Usnadnění přístupu je aktivováno."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 21a7bf46d9b9..dc613f6a5dfd 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Tillader, at appen kan hente systemets interne tilstand. Ondsindede apps kan hente en lang række fortrolige og beskyttede oplysninger, som de normalt aldrig ville have brug for."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"hente skærmindhold"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Tillader, at appen kan hente indholdet i det aktive vindue. Ondsindede apps kan hente al indholdet i vinduet og undersøge al dens tekst med undtagelse af adgangskoder."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"aktivér tilgængelighed midlertidigt"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Tillader, at en applikation midlertidigt kan aktivere tilgængelighed på enheden. Skadelige apps kan muligvis aktivere tilgængelighed uden brugerens samtykke."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"hent oplysninger om vinduer"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Tillader, at en applikation henter oplysninger om vinduerne i vinduesadministratoren. Skadelige apps kan muligvis hente oplysninger, der er beregnet til intern systembrug."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrer begivenheder"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Mønster er ryddet"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Celle er tilføjet"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Mønster er afsluttet"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Tillad"</string> <string name="sms_control_no" msgid="625438561395534982">"Afvis"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vil sende en besked til <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Din mobilkonto kan blive debiteret."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Dette vil medføre gebyrer på din mobilkonto."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Send"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Annuller"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Husk mit valg"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Tillad altid"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Tillad aldrig"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kort blev fjernet"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Hovedtelefoner"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dockstationens højttalere"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-lyd"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-lyd"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Udfør"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Medieudgang"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Indbygget skærm"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI-skærm"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Overlejring nr. <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Indtast pinkode til SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Indtast pinkode"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Angiv adgangskode"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK-kode"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Ny pinkode"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM-kortet låses op…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Forkert pinkode."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Indtast en pinkode på mellem 4 og 8 tal."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Angiv en PUK-kode på 8 eller flere cifre."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Indtast PUK-koden og den nye pinkode"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Den indtastede PUK-kode er forkert."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"For mange forsøg på at tegne mønstret korrekt"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Lås op ved at logge ind med din Google-konto."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Brugernavn (e-mail)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Log ind"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Ugyldigt brugernavn eller ugyldig adgangskode."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Har du glemt dit brugernavn eller din adgangskode?"\n"Gå til "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Kontrollerer..."</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Du har indtastet en forkert pinkode <xliff:g id="NUMBER_0">%d</xliff:g> gange. "\n\n"Prøv igen om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Du har indtastet din adgangskode forkert <xliff:g id="NUMBER_0">%d</xliff:g> gange. "\n\n"Prøv igen om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Du har tegnet dit oplåsningsmønster forkert <xliff:g id="NUMBER_0">%d</xliff:g> gange. "\n\n"Prøv igen om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Du har tegnet dit oplåsningsmønster forkert <xliff:g id="NUMBER_0">%d</xliff:g> gange. Efter <xliff:g id="NUMBER_1">%d</xliff:g> yderligere mislykkede forsøg vil du blive bedt om at låse din tablet op ved hjælp af en e-mailkonto"\n\n" Prøv igen om <xliff:g id="NUMBER_2">%d</xliff:g> sekunder."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Du har tegnet dit oplåsningsmønster forkert <xliff:g id="NUMBER_0">%d</xliff:g> gange. Efter <xliff:g id="NUMBER_1">%d</xliff:g> yderligere mislykkede forsøg til vil du blive bedt om at låse din telefon op ved hjælp af en e-mailkonto."\n\n" Prøv igen om <xliff:g id="NUMBER_2">%d</xliff:g> sekunder."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Skal lydstyrken være over det sikre niveau?"\n"Du kan skade din hørelse ved at lytte ved høj lydstyrke i længere tid."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Tilgængelighed aktiveret."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index f46f3133f9f5..f38d0237125d 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Ermöglicht der App, den internen Systemstatus abzurufen. Schädliche Apps können so eine Vielzahl an privaten und geschützten Daten abrufen, die sie in der Regel nicht benötigen."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"Bildschirminhalt abrufen"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Ermöglicht der App, den Inhalt des aktiven Fensters abzurufen. Schädliche Apps können so den gesamten Fensterinhalt abrufen und mit Ausnahme von Passwörtern den gesamten Text auswerten."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"Bedienungshilfen vorübergehend aktivieren"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Ermöglicht einer App, die Bedienungshilfen auf dem Gerät vorübergehend zu aktivieren. Schädliche Apps können Bedienungshilfen ohne die Zustimmung des Nutzers aktivieren."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"Fensterinformationen abrufen"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Ermöglicht einer App, Informationen über die Fenster vom Fenster-Manager abzurufen. Schädliche Apps können Informationen abrufen, die für die systeminterne Nutzung gedacht sind."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"Ereignisse filtern"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Muster gelöscht"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Zelle hinzugefügt"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Muster abgeschlossen"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1016,8 +1022,8 @@ <string name="chooseUsbActivity" msgid="6894748416073583509">"App für USB-Gerät auswählen"</string> <string name="noApplications" msgid="2991814273936504689">"Diese Aktion kann von keiner App ausgeführt werden."</string> <string name="aerr_title" msgid="1905800560317137752"></string> - <string name="aerr_application" msgid="932628488013092776">"\"<xliff:g id="APPLICATION">%1$s</xliff:g>\" wurde leider beendet."</string> - <string name="aerr_process" msgid="4507058997035697579">"Leider wurde der Prozess <xliff:g id="PROCESS">%1$s</xliff:g> beendet."</string> + <string name="aerr_application" msgid="932628488013092776">"\"<xliff:g id="APPLICATION">%1$s</xliff:g>\" wurde beendet."</string> + <string name="aerr_process" msgid="4507058997035697579">"Der Prozess <xliff:g id="PROCESS">%1$s</xliff:g> wurde beendet."</string> <string name="anr_title" msgid="4351948481459135709"></string> <string name="anr_activity_application" msgid="1904477189057199066">"<xliff:g id="APPLICATION">%2$s</xliff:g> reagiert nicht."\n\n"Möchten Sie die App schließen?"</string> <string name="anr_activity_process" msgid="5776209883299089767">"Aktivität \"<xliff:g id="ACTIVITY">%1$s</xliff:g>\" reagiert nicht."\n\n"Möchten Sie sie beenden?"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Zulassen"</string> <string name="sms_control_no" msgid="625438561395534982">"Nicht zulassen"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> möchte eine Nachricht an <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> senden."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Hierfür können Ihrem Mobilfunkkonto Gebühren berechnet werden."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Hierfür werden Ihrem Mobilfunkkonto Gebühren berechnet."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Hierfür könnten Ihrem Mobilfunkkonto "<font fgcolor="#ffffb060">"Gebühren berechnet werden"</font>"."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Hierfür werden Ihrem Mobilfunkkonto Gebühren berechnet."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Senden"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Abbrechen"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Auswahl merken"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Sie können dies unter \"Einstellungen > Apps\" ändern."</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Immer zulassen"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Nie zulassen"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-Karte entfernt"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Kopfhörer"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dock-Lautsprecher"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-Audio"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-Audio"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Fertig"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Medienausgabe"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Wird gescannt..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Verbindung wird hergestellt..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Verfügbar"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Nicht verfügbar"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Integrierter Bildschirm"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI-Bildschirm"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Overlay-Nr. <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"SIM-PIN eingeben"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"PIN eingeben"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Passwort eingeben"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK-Code"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Neuer PIN-Code"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Die SIM-Karte ist jetzt deaktiviert. Geben Sie den PUK-Code ein, um fortzufahren. Weitere Informationen erhalten Sie von Ihrem Mobilfunkanbieter."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Gewünschten PIN-Code eingeben"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Gewünschten PIN-Code bestätigen"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM-Karte wird entsperrt…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Falscher PIN-Code"</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Geben Sie eine 4- bis 8-stellige PIN ein."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Geben Sie eine mindestens 8-stellige PUK ein."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"PUK und neuen PIN-Code eingeben"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Die von Ihnen eingegebene PUK ist nicht korrekt."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Der PUK-Code muss mindestens 8 Ziffern betragen."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Geben Sie den richtigen PUK-Code ein. Bei wiederholten Versuchen wird die SIM-Karte dauerhaft deaktiviert."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-Codes stimmen nicht überein"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Zu viele Musterversuche"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Melden Sie sich zum Entsperren mit Ihrem Google-Konto an."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nutzername (E-Mail)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Anmelden"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Ungültiger Nutzername oder ungültiges Passwort"</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Nutzernamen oder Passwort vergessen?"\n"Besuchen Sie "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Überprüfung…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"SIM-Karte wird entsperrt…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Sie haben Ihre PIN <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch eingegeben."\n\n"Versuchen Sie es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Sie haben Ihr Passwort <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch eingegeben."\n\n"Versuchen Sie es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Sie haben Ihr Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. "\n\n"Versuchen Sie es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Sie haben Ihr Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen werden Sie aufgefordert, Ihr Tablet mithilfe eines E-Mail-Kontos zu entsperren."\n\n" Versuchen Sie es in <xliff:g id="NUMBER_2">%d</xliff:g> Sekunden erneut."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Sie haben Ihr Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen werden Sie aufgefordert, Ihr Telefon mithilfe eines E-Mail-Kontos zu entsperren."\n\n" Versuchen Sie es in <xliff:g id="NUMBER_2">%d</xliff:g> Sekunden erneut."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Lautstärke höher als Schwellenwert stellen?"\n"Wenn Sie über längere Zeiträume hinweg Musik in hoher Lautstärke hören, kann dies Ihr Gehör schädigen."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Bedienungshilfen aktiviert"</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index ded1b1c200b1..97acffc0e85f 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Επιτρέπει στην εφαρμογή την ανάκτηση της εσωτερικής κατάστασης του συστήματος. Τυχόν κακόβουλες εφαρμογές ενδέχεται να ανακτήσουν μεγάλη ποικιλία ιδιωτικών πληροφοριών και πληροφοριών ασφάλειας οι οποίες δεν θα έπρεπε να τους είναι απαραίτητες υπό φυσιολογικές συνθήκες."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"ανάκτηση περιεχομένου οθόνης"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Επιτρέπει στην εφαρμογή την ανάκτηση του περιεχομένου του ενεργού παραθύρου. Τυχόν κακόβουλες εφαρμογές ενδέχεται να ανακτήσουν ολόκληρο το περιεχόμενο του παραθύρου και να εξετάσουν ολόκληρο το κείμενό του εκτός από τους κωδικούς πρόσβασης."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"προσωρινή ενεργοποίηση προσβασιμότητας"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Επιτρέπει σε μια εφαρμογή να ενεργοποιήσει την προσβασιμότητα στη συσκευή. Οι κακόβουλες εφαρμογές ενδέχεται να ενεργοποιήσουν την προσβασιμότητα χωρίς τη συγκατάθεση των χρηστών."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"ανάκτηση πληροφοριών παραθύρων"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Επιτρέπει σε μια εφαρμογή να ανακτήσει πληροφορίες σχετικά με τα παράθυρα από το διαχειριστή παραθύρων. Οι κακόβουλες εφαρμογές ενδέχεται να ανακτήσουν πληροφορίες που προορίζονται για την εσωτερική χρήση του συστήματος."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"φιλτράρισμα συμβάντων"</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Το μοτίβο απαλείφθηκε"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Προστέθηκε κελί"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Το μοτίβο ολοκληρώθηκε"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Γραφικό στοιχείο %2$d από %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Επιλογέας χρήστη"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Κατάσταση"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Στοιχεία ελέγχου μέσων"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ΑΒΓ"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1103,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Αποδοχή"</string> <string name="sms_control_no" msgid="625438561395534982">"Άρνηση"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"Η εφαρμογή <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> θέλει να αποστείλει ένα μήνυμα στη διεύθυνση <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Ενδέχεται να χρεωθεί ο λογαριασμός κινητού τηλεφώνου σας."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Θα χρεωθεί ο λογαριασμός κινητού τηλεφώνου σας."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Αυτή η ρύθμιση "<font fgcolor="#ffffb060">"ενδέχεται να επιφέρει χρεώσεις"</font>" στον λογαριασμό κινητού σας."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Αυτή η ρύθμιση θα επιφέρει χρεώσεις στον λογαριασμό κινητού σας."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Αποστολή"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Ακύρωση"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Απομνημόνευση της επιλογής μου"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Μπορ.να το αλλάξ.αργ.στις Ρυθ. > Εφ."</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Να επιτρέπεται πάντα"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Να μην επιτρέπεται ποτέ"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Η κάρτα SIM αφαιρέθηκε"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Τηλέφωνο"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Ακουστικά"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Ηχεία βάσης σύνδεσης"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Ήχος HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Σύστημα"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Ήχος Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Τέλος"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Έξοδος μέσων"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Σάρωση…"</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Σύνδεση…"</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Διαθέσιμη"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Μη διαθέσιμο"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Ενσωματωμένη οθόνη"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Οθόνη HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Επικάλυψη #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Εισαγωγή PIN SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Πληκτρολογήστε το PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Εισαγάγετε κωδικό πρόσβασης"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Κωδικός PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Νέος κωδικός PIN"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Η κάρτα SIM είναι απενεργοποιημένη αυτή τη στιγμή. Εισαγάγετε τον κωδικό PUK για να συνεχίσετε. Επικοινωνήστε με την εταιρεία κινητής τηλεφωνίας σας για λεπτομέρειες."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Εισαγάγετε τον απαιτούμενο κωδικό PIN"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Επιβεβαιώστε τον απαιτούμενο κωδικό PIN"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Ξεκλείδωμα κάρτας SIM..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Εσφαλμένος κωδικός PIN."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Πληκτρολογήστε έναν αριθμό PIN που να αποτελείται από 4 έως 8 αριθμούς."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Πληκτρολογήστε έναν κωδικό PUK με 8 αριθμούς ή περισσότερους."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Πληκτρολογήστε τον κωδικό PUK και τον νέο κωδικό PIN"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Ο κωδικός PUK που πληκτρολογήσατε είναι εσφαλμένος."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Ο κωδικός PUK θα πρέπει να περιέχει τουλάχιστον 8 αριθμούς."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Εισαγάγετε ξανά τον κωδικό PUK. Οι επαναλαμβανόμενες προσπάθειες θα απενεργοποιήσουν οριστικά την κάρτα SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Δεν υπάρχει αντιστοιχία των κωδικών PIN"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Πάρα πολλές προσπάθειες μοτίβου"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Για ξεκλείδωμα, συνδεθείτε με τον λογαριασμό σας Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Όνομα χρήστη (διεύθυνση ηλεκτρονικού ταχυδρομείου)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Σύνδεση"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Μη έγκυρο όνομα χρήστη ή κωδικός πρόσβασης."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Ξεχάσατε το όνομα χρήστη ή τον κωδικό πρόσβασής σας;"\n"Επισκεφτείτε τη διεύθυνση "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Έλεγχος…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Ξεκλείδωμα SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Έχετε πληκτρολογήσει εσφαλμένα τον κωδικό σας PIN <xliff:g id="NUMBER_0">%d</xliff:g> φορές. "\n\n"Δοκιμάστε ξανά σε <xliff:g id="NUMBER_1">%d</xliff:g> δευτερόλεπτα."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Έχετε πληκτρολογήσει τον κωδικό πρόσβασης εσφαλμένα <xliff:g id="NUMBER_0">%d</xliff:g> φορές. "\n\n"Δοκιμάστε ξανά σε <xliff:g id="NUMBER_1">%d</xliff:g> δευτερόλεπτα."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Σχεδιάσατε εσφαλμένα το μοτίβο ξεκλειδώματος <xliff:g id="NUMBER_0">%d</xliff:g> φορές. "\n\n"Δοκιμάστε ξανά σε <xliff:g id="NUMBER_1">%d</xliff:g> δευτερόλετπα."</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Σχεδιάσατε το μοτίβο ξεκλειδώματος εσφαλμένα <xliff:g id="NUMBER_0">%d</xliff:g> φορές. Μετά από <xliff:g id="NUMBER_1">%d</xliff:g> ανεπιτυχείς προσπάθειες ακόμη, θα σας ζητηθεί να ξεκλειδώσετε το tablet σας με τη χρήση ενός λογαριασμού ηλεκτρονικού ταχυδρομείου."\n\n" Δοκιμάστε να συνδεθείτε ξανά σε <xliff:g id="NUMBER_2">%d</xliff:g> δευτερόλεπτα."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Σχεδιάσατε το μοτίβο ξεκλειδώματος εσφαλμένα <xliff:g id="NUMBER_0">%d</xliff:g> φορές. Μετά από <xliff:g id="NUMBER_1">%d</xliff:g> ανεπιτυχείς προσπάθειες ακόμη, θα σας ζητηθεί να ξεκλειδώσετε το τηλέφωνό σας με τη χρήση ενός λογαριασμού ηλεκτρονικού ταχυδρομείου."\n\n" Δοκιμάστε ξανά σε <xliff:g id="NUMBER_2">%d</xliff:g> δευτερόλεπτα."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Αύξηση έντασης ήχου πάνω από το επίπεδο ασφαλείας;"\n"Αν ακούτε μουσική σε υψηλή ένταση για μεγάλο χρονικό διάστημα ενδέχεται να προκληθεί βλάβη στην ακοή σας."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"Αγγίξτε παρατεταμένα με δύο δάχτυλα για να ενεργοποιήσετε τη λειτουργία προσβασιμότητας."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"Ενεργοποιήθηκε η προσβασιμότητα."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Η λειτουργία προσβασιμότητας ακυρώθηκε."</string> + <string name="user_switched" msgid="3768006783166984410">"Τρέχων χρήστης <xliff:g id="NAME">%1$s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index d8e924edf55d..c470542a6d90 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -156,7 +156,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Power off"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Bug report"</string> <string name="bugreport_title" msgid="2667494803742548533">"Take bug report"</string> - <string name="bugreport_message" msgid="398447048750350456">"This will collect information about your current device state, to send as an e-mail message. It will take a little time from starting the bug report until it is ready to be sent; please be patient."</string> + <string name="bugreport_message" msgid="398447048750350456">"This will collect information about your current device state, to send as an email message. It will take a little time from starting the bug report until it is ready to be sent. Please be patient."</string> <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Silent mode"</string> <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Sound is OFF"</string> <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Sound is ON"</string> @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Allows the app to retrieve the internal state of the system. Malicious apps may retrieve a wide variety of private and secure information that they should never normally need."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"retrieve screen content"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Allows the app to retrieve the content of the active window. Malicious apps may retrieve the entire window content and examine all its text except passwords."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"temporary enable accessibility"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Allows an application to temporarily enable accessibility on the device. Malicious apps may enable accessibility without user consent."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"retrieve window info"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Allows an application to retrieve information about the windows from the window manager. Malicious apps may retrieve information that is intended for internal system usage."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filter events"</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Pattern cleared"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Cell added"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Pattern completed"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Widget %2$d of %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"User selector"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Status"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Media controls"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1103,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Allow"</string> <string name="sms_control_no" msgid="625438561395534982">"Deny"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> would like to send a message to <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"This may cause charges on your mobile account."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"This will cause charges on your mobile account."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"This "<font fgcolor="#ffffb060">"may cause charges"</font>" on your mobile account."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"This will cause charges on your mobile account."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Send"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Cancel"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Remember my choice"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"You can change this later in Settings > Apps"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Always Allow*"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Never Allow"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM card removed"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Phone"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Headphones"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dock speakers"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI audio"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth audio"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Done"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Media output"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Scanning..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Connecting..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Available"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Not available"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Built-in Screen"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI Screen"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Overlay #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Enter SIM PIN"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Enter PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Enter Password"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK code"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"New PIN code"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Enter desired PIN code"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Confirm desired PIN code"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Unlocking SIM card…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Incorrect PIN code."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Type a PIN that is 4 to 8 numbers."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Type a PUK that is 8 numbers or longer."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Type PUK and new PIN code"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"The PUK you typed isn\'t correct."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK code should be 8 numbers or more."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Re-enter the correct PUK code. Repeated attempts will permanently disable the SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN codes do not match"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Too many pattern attempts"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"To unlock, sign in with your Google account."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Username (email)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Sign in"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Invalid username or password."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Forgot your username or password?"\n"Visit "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Checking…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Unlocking SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"You have incorrectly typed your PIN <xliff:g id="NUMBER_0">%d</xliff:g> times. "\n\n"Try again in <xliff:g id="NUMBER_1">%d</xliff:g> seconds."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"You have incorrectly typed your password <xliff:g id="NUMBER_0">%d</xliff:g> times. "\n\n"Try again in <xliff:g id="NUMBER_1">%d</xliff:g> seconds."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%d</xliff:g> times. "\n\n"Try again in <xliff:g id="NUMBER_1">%d</xliff:g> seconds."</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%d</xliff:g> times. After <xliff:g id="NUMBER_1">%d</xliff:g> more unsuccessful attempts, you will be asked to unlock your tablet using an email account."\n\n" Try again in <xliff:g id="NUMBER_2">%d</xliff:g> seconds."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%d</xliff:g> times. After <xliff:g id="NUMBER_1">%d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account."\n\n" Try again in <xliff:g id="NUMBER_2">%d</xliff:g> seconds."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Raise volume above safe level?"\n"Listening at high volume for long periods may damage your hearing."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"Keep holding down your two fingers to enable accessibility."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"Accessibility enabled."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibility cancelled."</string> + <string name="user_switched" msgid="3768006783166984410">"Current user <xliff:g id="NAME">%1$s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 8e3827dd58c0..0553dc76f41b 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Permite que la aplicación recupere el estado interno del sistema. Las aplicaciones maliciosas pueden recuperar una amplia variedad de información privada y segura que normalmente no necesitarían."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"recuperar contenido de la pantalla"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Permite que la aplicación recupere el contenido de la ventana activa. Las aplicaciones maliciosas pueden recuperar el contenido completo de la ventana y examinar todo el texto, excepto las contraseñas."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"Activación temporal de la accesibilidad"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Permite a una aplicación activar la accesibilidad en el dispositivo temporalmente. Las aplicaciones maliciosas pueden activar la accesibilidad sin el consentimiento del usuario."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"recuperar información de ventanas"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Permite que una aplicación recupere la información del administrador de ventanas relacionada con estas. Las aplicaciones maliciosas pueden recuperar información destinada al uso interno del sistema."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrar eventos"</string> @@ -324,7 +322,7 @@ <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"mostrar ventanas no autorizadas"</string> <string name="permdesc_internalSystemWindow" msgid="7458387759461466397">"Permite que la aplicación cree ventanas para la interfaz de usuario interna del sistema. Las aplicaciones normales no deben usar este permiso."</string> <string name="permlab_systemAlertWindow" msgid="3543347980839518613">"destacar sobre otras aplicaciones"</string> - <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"Permite a la aplicación elegir por encima de otras aplicaciones o partes de la interfaz de usuario que pueden interferir en tu uso de la interfaz en cualquier aplicación o cambiar lo que crees que ves en otras aplicaciones."</string> + <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"Permite a la aplicación escribir por encima de otras aplicaciones o partes de la interfaz de usuario que pueden interferir en tu uso de la interfaz en cualquier aplicación o cambiar lo que crees que ves en otras aplicaciones."</string> <string name="permlab_setAnimationScale" msgid="2805103241153907174">"modificar la velocidad de la animación global"</string> <string name="permdesc_setAnimationScale" msgid="7690063428924343571">"Permite que la aplicación cambie la velocidad de animación global (animaciones más rápidas o más lentas) en cualquier momento."</string> <string name="permlab_manageAppTokens" msgid="1286505717050121370">"administrar tokens de aplicación"</string> @@ -372,8 +370,8 @@ <string name="permlab_installPackages" msgid="2199128482820306924">"instalar aplicaciones directamente"</string> <string name="permdesc_installPackages" msgid="5628530972548071284">"Permite que la aplicación instale paquetes de Android nuevos o actualizados. Las aplicaciones maliciosas pueden utilizar este permiso para agregar nuevas aplicaciones con permisos arbitrarios potentes."</string> <string name="permlab_clearAppCache" msgid="7487279391723526815">"eliminar todos los datos de caché de la aplicación"</string> - <string name="permdesc_clearAppCache" product="tablet" msgid="8974640871945434565">"Permite a la aplicación liberar almacenamiento de la tableta al eliminar archivos en los directorios de memoria cache de otras aplicaciones. Esto puede ocasionar que otras aplicaciones arranquen más lentamente, ya que deben volver a recuperar sus datos."</string> - <string name="permdesc_clearAppCache" product="default" msgid="2459441021956436779">"Permite a la aplicación liberar almacenamiento del teléfono al borrar los archivos en los directorios de memoria cache de otras aplicaciones. Esto puede ocasionar que otras aplicaciones arranquen más lentamente, ya que deben volver a recuperar sus datos."</string> + <string name="permdesc_clearAppCache" product="tablet" msgid="8974640871945434565">"Permite a la aplicación liberar almacenamiento de la tableta al eliminar archivos en los directorios de la memoria cache de otras aplicaciones. Esto puede ocasionar que otras aplicaciones arranquen más lentamente, ya que deben volver a recuperar sus datos."</string> + <string name="permdesc_clearAppCache" product="default" msgid="2459441021956436779">"Permite a la aplicación liberar almacenamiento del dispositivo al borrar los archivos en los directorios de la memoria cache de otras aplicaciones. Esto puede ocasionar que otras aplicaciones arranquen más lentamente, ya que deben volver a recuperar sus datos."</string> <string name="permlab_movePackage" msgid="3289890271645921411">"mover recursos de la aplicación"</string> <string name="permdesc_movePackage" msgid="319562217778244524">"Permite que la aplicación traslade recursos de la aplicación de medios internos a medios externos y viceversa."</string> <string name="permlab_readLogs" msgid="6615778543198967614">"lee los datos confidenciales del registro"</string> @@ -435,9 +433,9 @@ <string name="permlab_installLocationProvider" msgid="6578101199825193873">"autorización para instalar un proveedor de ubicación"</string> <string name="permdesc_installLocationProvider" msgid="9066146120470591509">"Permite crear fuentes de ubicación simuladas para hacer pruebas o instalar un nuevo proveedor de ubicación. Este permiso autoriza a la aplicación a sobrescribir la ubicación o el estado proporcionados por otras fuentes de ubicación, como los proveedores de ubicación o GPS."</string> <string name="permlab_accessFineLocation" msgid="1191898061965273372">"ubicación precisa (según el GPS y la red)"</string> - <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"Permite a la aplicación obtener tu ubicación precisa mediante el Sistema de Posicionamiento Global (GPS) o las fuentes de ubicación de red, como las torres de celulares y Wi-Fi. Estos servicios de localización deben estar encendidos y disponibles en tu dispositivo para que los use la aplicación. Las aplicaciones pueden usarlo para determinar tu ubicación, lo cual puede consumir más batería."</string> + <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"Permite a la aplicación obtener tu ubicación precisa mediante el Sistema de Posicionamiento Global (GPS) o las fuentes de ubicación de red, como las torres de celulares y Wi-Fi. Estos servicios de ubicación deben estar encendidos y disponibles en tu dispositivo para que los use la aplicación. Las aplicaciones pueden usarlo para determinar tu ubicación, lo cual puede consumir más batería."</string> <string name="permlab_accessCoarseLocation" msgid="4887895362354239628">"ubicación aproximada (según la red)"</string> - <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"Permite a la aplicación obtener tu ubicación aproximada. Esta ubicación se deriva de los servicios de localización que usan fuentes de ubicación de red, como torres de celulares y Wi-Fi. Estos servicios de localización deben estar encendidos y disponibles en tu dispositivo para que los use la aplicación. Las aplicaciones pueden usarlo para determinar tu ubicación aproximada."</string> + <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"Permite a la aplicación obtener tu ubicación aproximada. Esta ubicación deriva de los servicios de ubicación que usan fuentes de ubicación de red, como torres de celulares y Wi-Fi. Estos servicios de ubicación deben estar encendidos y disponibles en tu dispositivo para que los use la aplicación. Las aplicaciones pueden usarlo para determinar tu ubicación aproximada."</string> <string name="permlab_accessSurfaceFlinger" msgid="2363969641792388947">"acceder a SurfaceFlinger"</string> <string name="permdesc_accessSurfaceFlinger" msgid="1041619516733293551">"Permite que la aplicación utilice funciones de SurfaceFlinger de bajo nivel."</string> <string name="permlab_readFrameBuffer" msgid="6690504248178498136">"leer el búfer de tramas"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Se eliminó el patrón"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Se agregó una celda."</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Se completó el patrón"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1094,18 +1100,22 @@ <string name="wifi_p2p_to_message" msgid="248968974522044099">"Para:"</string> <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Escribe el PIN solicitado:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> - <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"El teléfono se desconectará temporalmente del sistema Wi-Fi mientras esté conectado a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> + <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"El dispositivo se desconectará temporalmente de la red Wi-Fi mientras esté conectado a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="select_character" msgid="3365550120617701745">"Insertar caracteres"</string> <string name="sms_control_title" msgid="7296612781128917719">"Enviando mensajes SMS"</string> <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> está enviando una gran cantidad de mensajes SMS. ¿Quieres permitir que está aplicación siga enviando mensajes?"</string> <string name="sms_control_yes" msgid="3663725993855816807">"Permitir"</string> <string name="sms_control_no" msgid="625438561395534982">"Rechazar"</string> - <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> deseas enviar un mensaje a <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Esto puede generar cargos en tu cuenta de dispositivos móviles."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Esto generará cargos en tu cuenta de dispositivos móviles."</string> + <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> desea enviar un mensaje a <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Enviar"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Cancelar"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Recordar mi elección"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Permitir siempre"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"No permitir nunca"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Tarjeta SIM eliminada"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Dispositivo"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Auriculares"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altavoces del conector"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Audio Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Listo"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Salida multimedia"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Pantalla integrada"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Pantalla HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Superposición #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Ingresa el PIN de la tarjeta SIM."</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Ingresa el PIN."</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Ingresa tu contraseña."</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Código PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Nuevo código PIN"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Desbloqueando tarjeta SIM…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Código PIN incorrecto"</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Escribe un PIN que tenga de cuatro a ocho números."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Ingresa un código PUK de ocho números o más."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Escribe el código PUK y un nuevo código PIN."</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"El código PUK que escribiste es incorrecto."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Demasiados intentos incorrectos de ingresar el patrón"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Para desbloquear, accede con tu cuenta de Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nombre de usuario (correo)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Acceder"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nombre de usuario o contraseña incorrectos"</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"¿Olvidaste tu nombre de usuario o contraseña?"\n"Accede a "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Comprobando…"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Escribiste incorrectamente tu PIN <xliff:g id="NUMBER_0">%d</xliff:g> veces. "\n\n"Vuelve a intentarlo en <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Escribiste incorrectamente tu contraseña <xliff:g id="NUMBER_0">%d</xliff:g> veces. "\n\n"Vuelve a intentarlo en <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Dibujaste incorrectamente tu patrón de desbloqueo <xliff:g id="NUMBER_0">%d</xliff:g> veces. "\n\n"Vuelve a intentarlo en <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> @@ -1409,13 +1436,12 @@ <string name="kg_failed_attempts_now_wiping" product="default" msgid="4817627474419471518">"Intentaste desbloquear el dispositivo <xliff:g id="NUMBER">%d</xliff:g> veces, pero no lo lograste. Se restablecerán los valores predeterminados de fábrica del dispositivo."</string> <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Dibujaste incorrectamente tu patrón de desbloqueo <xliff:g id="NUMBER_0">%d</xliff:g> veces. Luego de <xliff:g id="NUMBER_1">%d</xliff:g> intentos incorrectos más, se te solicitará que desbloquees tu tableta mediante el uso de una cuenta de correo."\n\n" Vuelve a intentarlo en <xliff:g id="NUMBER_2">%d</xliff:g> segundos."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Dibujaste incorrectamente tu patrón de desbloqueo <xliff:g id="NUMBER_0">%d</xliff:g> veces. Luego de <xliff:g id="NUMBER_1">%d</xliff:g> intentos incorrectos más, se te solicitará que desbloquees tu dispositivo mediante el uso de una cuenta de correo."\n\n" Vuelve a intentarlo en <xliff:g id="NUMBER_2">%d</xliff:g> segundos."</string> - <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"¿Aumentar el volumen sobre el nivel seguro?"\n"Si escuchas con el volumen alto durante períodos prolongados, puedes dañar tu audición."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"¿Aumentar el volumen por encima del nivel seguro?"\n"Si escuchas con el volumen alto durante períodos prolongados, puedes dañar tu audición."</string> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Se activó la accesibilidad."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 7b47b51bc51b..542f61d3a154 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Permite que la aplicación recupere el estado interno del sistema. Las aplicaciones malintencionadas pueden usar este permiso para recuperar una gran variedad de información protegida y privada que normalmente no deberían necesitar."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"recuperar contenido de la pantalla"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Permite que la aplicación recupere el contenido de la ventana activa. Las aplicaciones malintencionadas pueden recuperar todo el contenido de la ventana y analizar todo el texto de la misma, excepto las contraseñas."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"habilitar la accesibilidad de forma temporal"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Permite que una aplicación habilite la accesibilidad en el dispositivo de forma temporal. Las aplicaciones maliciosas pueden habilitar la accesibilidad sin el consentimiento del usuario."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"recuperar información de ventanas"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Permite que una aplicación recupere información sobre las ventanas del administrador de ventanas. Las aplicaciones malintencionadas pueden recuperar información destinada al uso interno del sistema."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrar eventos"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Patrón borrado"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Se ha añadido una celda."</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Patrón completado"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Permitir"</string> <string name="sms_control_no" msgid="625438561395534982">"Denegar"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> quiere enviar un mensaje a <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Es posible que se apliquen cargos en tu cuenta móvil."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Se aplicarán cargos en tu cuenta móvil."</string> + <string name="sms_short_code_details" msgid="3492025719868078457"><font fgcolor="#ffffb060">"Es posible que se apliquen cargos"</font>" en tu cuenta móvil."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Se aplicarán cargos en tu cuenta móvil."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Enviar"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Cancelar"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Recordar opción seleccionada"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Puedes cambiar esta opción más tarde en Ajustes > Aplicaciones."</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Permitir siempre"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"No permitir nunca"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Tarjeta SIM eliminada"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Teléfono"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Auriculares"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altavoces del conector"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Audio Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Fin"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Salida multimedia"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Analizando..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Conectando..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Disponible"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"No disponible"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Pantalla integrada"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Pantalla HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Superposición #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Introduce el PIN de la tarjeta SIM."</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Introduce el PIN."</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Escribe tu contraseña."</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Código PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Nuevo código PIN"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"La tarjeta SIM está inhabilitada. Para continuar, introduce el código PUK. Si quieres obtener más información, ponte en contacto con el operador"</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Introduce el código PIN deseado"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Confirma el código PIN"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Desbloqueando tarjeta SIM…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Código PIN incorrecto"</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Introduce un código PIN con una longitud comprendida entre cuatro y ocho dígitos."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Escribe un código PUK de ocho caracteres o más."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Introduce el código PUK y un nuevo código PIN."</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"El código PUK que has introducido no es correcto."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"El código PUK debe tener ocho números como mínimo."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Vuelve a introducir el código PUK correcto. Si introduces un código incorrecto varias veces, se inhabilitará la tarjeta SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Los códigos PIN no coinciden."</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Demasiados intentos incorrectos de crear el patrón"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Para desbloquear el teléfono, inicia sesión con tu cuenta de Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nombre de usuario (correo electrónico)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Iniciar sesión"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"El nombre de usuario o la contraseña no son válidos."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Si has olvidado tu nombre de usuario o tu contraseña,"\n"accede a la página "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Comprobando..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Desbloqueando tarjeta SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Has introducido un código PIN incorrecto <xliff:g id="NUMBER_0">%d</xliff:g> veces. "\n\n"Inténtalo de nuevo en <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Has introducido una contraseña incorrecta <xliff:g id="NUMBER_0">%d</xliff:g> veces. "\n\n"Inténtalo de nuevo en <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Has fallado <xliff:g id="NUMBER_0">%d</xliff:g> veces al dibujar tu patrón de desbloqueo. "\n\n"Inténtalo de nuevo en <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Has fallado <xliff:g id="NUMBER_0">%d</xliff:g> veces al dibujar el patrón de desbloqueo. Si fallas otras <xliff:g id="NUMBER_1">%d</xliff:g> veces, deberás usar una cuenta de correo electrónico para desbloquear el tablet."\n\n" Inténtalo de nuevo en <xliff:g id="NUMBER_2">%d</xliff:g> segundos."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Has fallado <xliff:g id="NUMBER_0">%d</xliff:g> veces al dibujar el patrón de desbloqueo. Si fallas otras <xliff:g id="NUMBER_1">%d</xliff:g> veces, deberás usar una cuenta de correo electrónico para desbloquear el teléfono."\n\n" Inténtalo de nuevo en <xliff:g id="NUMBER_2">%d</xliff:g> segundos."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"¿Subir el volumen por encima del nivel de seguridad?"\n"Escuchar sonidos a alto volumen durante largos períodos de tiempo puede dañar tus oídos."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Accesibilidad habilitada"</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 7fb52fdfaa55..0b2d31e76228 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Võimaldab rakendusel teada saada süsteemi sisemist olekut. Pahatahtlikud rakendused võivad hankida mitmesugust privaatset ja turvateavet, mida neil tavaliselt kunagi vaja ei lähe."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"ekraanisisu taastamine"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Võimaldab rakendusel kätte saada aktiivse akna sisu. Pahatahtlikud rakendused võivad hankida kogu akna sisu ja uurida kogu selle teksti, välja arvatud paroole."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"ajutine hõlbustuse lubamine"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Lubab rakendusel ajutiselt lubada seadmes hõlbustuse. Pahatahtlikud rakendused võivad lubada hõlbustuse kasutaja nõusolekuta."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"hangi akna teave"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Võimaldab rakendusel hankida teavet aknahalduri akende kohta. Pahatahtlikud rakendused võivad hankida teavet, mis on mõeldud süsteemisiseseks kasutamiseks."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtreeri sündmused"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Muster on kustutatud"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Lahter on lisatud"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Muster on valmis"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Luba"</string> <string name="sms_control_no" msgid="625438561395534982">"Keela"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> soovib saata sõnumi aadressile <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"See võib tekitada mobiilikontole kulusid."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"See tekitab mobiilikontole kulusid."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"See "<font fgcolor="#ffffb060">"võib põhjustada kulusid"</font>" teie mobiilikontole."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"See lisab kulusid teie mobiilikontole."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Saada"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Tühista"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Jäta minu valik meelde"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Saate muuta jaotises Seaded > Rakend."</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Luba alati"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Ära luba"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kaart eemaldatud"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Kõrvaklapid"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Doki kõlarid"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI heli"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Süsteem"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-heli"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Valmis"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Meediaväljund"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Skaneering ..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Ühendan..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Saadaval"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Ei ole saadaval"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Sisseehitatud ekraan"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI-ekraan"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Ülekate nr .<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Sisestage SIM-i PIN-kood"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Sisestage PIN-kood"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Sisestage parool"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK-kood"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Uus PIN-kood"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM on nüüd keelatud. Jätkamiseks sisestage PUK-kood. Üksikasju küsige operaatorilt."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Sisestage soovitud PIN-kood"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Kinnitage soovitud PIN-kood"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM-kaardi avamine ..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Vale PIN-kood."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Sisestage 4–8-numbriline PIN-kood."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Sisestage 8-numbriline või pikem PUK-kood."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Sisestage PUK-kood ja uus PIN-kood"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Sisestatud PUK-kood pole õige."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK-koodi pikkus peab olema vähemalt 8 numbrit."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Sisestage uuesti õige PUK-kood. Korduvkatsete korral keelatakse SIM jäädavalt."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-koodid ei ole vastavuses"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Liiga palju mustrikatseid"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Avamiseks logige sisse oma Google\'i kontoga."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Kasutajanimi (e-post)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Logi sisse"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Vale kasutajanimi või parool."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Kas unustasite kasutajanime või parooli?"\n"Külastage aadressi "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Kontrollimine ..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"SIM-i avamine ..."</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Olete PIN-koodi <xliff:g id="NUMBER_0">%d</xliff:g> korda valesti sisestanud."\n\n"Proovige <xliff:g id="NUMBER_1">%d</xliff:g> sekundi pärast uuesti."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Olete parooli <xliff:g id="NUMBER_0">%d</xliff:g> korda valesti sisestanud. "\n\n"Proovige uuesti <xliff:g id="NUMBER_1">%d</xliff:g> sekundi pärast."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Joonistasite oma avamismustri <xliff:g id="NUMBER_0">%d</xliff:g> korda valesti."\n\n"Proovige <xliff:g id="NUMBER_1">%d</xliff:g> sekundi pärast uuesti."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Joonistasite oma avamismustri <xliff:g id="NUMBER_0">%d</xliff:g> korda valesti. Pärast veel <xliff:g id="NUMBER_1">%d</xliff:g> ebaõnnestunud katset palutakse teil tahvelarvuti avada meilikontoga."\n\n" Proovige uuesti <xliff:g id="NUMBER_2">%d</xliff:g> sekundi pärast."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Joonistasite oma avamismustri <xliff:g id="NUMBER_0">%d</xliff:g> korda valesti. Pärast veel <xliff:g id="NUMBER_1">%d</xliff:g> ebaõnnestunud katset palutakse teil telefon avada meilikontoga."\n\n" Proovige uuesti <xliff:g id="NUMBER_2">%d</xliff:g> sekundi pärast."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Kas suurendada helitugevust üle ohutu piiri?"\n"Pikaajaline suure helitugevusega muusika kuulamine võib kahjustada kuulmist."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Hõlbustus on lubatud."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 468ef9876290..fb1fdd7d6e35 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"به برنامه اجازه میدهد تا وضعیت داخلی سیستم را بازیابی کند. برنامههای مخرب میتوانند انواع مختلفی از اطلاعات خصوصی و امن را که معمولا به آنها نیاز ندارند، بازیابی کنند."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"بازیابی محتوای صفحه"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"به برنامه اجازه میدهد تا محتوای پنجره فعال را بازیابی کند. برنامههای مخرب میتوانند کل محتوای پنجره را بازیابی کنند و همه متن آنرا به غیر از گذرواژهها امتحان کنند."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"قابلیت دسترسی به طور موقت فعال شود"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"به یک برنامه اجازه میدهد به صورت موقت قابلیت دسترسی را در دستگاه فعال کند. برنامههای مخرب میتوانند قابلیت دسترسی را بدون رضایت کاربر فعال کنند."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"بازیابی اطلاعات پنجره"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"به یک برنامه کاربردی اجازه میدهد که اطلاعات مربوط به پنجرهها را از مدیریت پنجره بازیابی کند. برنامههای کاربردی مخرب ممکن است اطلاعاتی که برای استفاده سیستم داخلی درنظر گرفته شدهاند را بازیابی کنند."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"فیلتر کردن رویدادها"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"الگو پاک شد"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"سلول اضافه شد"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"الگو تکمیل شد"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"اجازه دادن"</string> <string name="sms_control_no" msgid="625438561395534982">"ردکردن"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> مایل است پیامی به <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> ارسال کند."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"این کار میتواند برای حساب تلفن همراه شما هزینه داشته باشد."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"این کار برای حساب تلفن همراه شما هزینه خواهد داشت."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"ارسال"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"لغو"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"این انتخاب را به خاطر بسپار"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"همیشه مجاز"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"همیشه غیرمجاز"</string> <string name="sim_removed_title" msgid="6227712319223226185">"سیم کارت برداشته شد"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"تلفن"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"هدفونها"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"بلندگوهای جایگاه اتصال"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"صدای HDMI"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"سیستم"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"بلوتوثهای صوتی"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"انجام شد"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"خروجی رسانه"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"صفحه نمایش از خود"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"صفحه HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"همپوشانی #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"پین سیم کارت را وارد کنید"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"پین را وارد کنید"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"گذرواژه را وارد کنید"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"کد PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"پین کد جدید"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"بازگشایی قفل سیم کارت..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"پین کد اشتباه است."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"یک پین ۴ تا ۸ رقمی را تایپ کنید."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"یک PUK با ۸ رقم یا بیشتر تایپ کنید."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"PUK و پین کد جدید را تایپ کنید"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"PUK که نوشتهاید صحیح نیست."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"تلاشهای زیادی برای کشیدن الگو صورت گرفته است"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"برای بازگشایی قفل، با حساب Google خود وارد سیستم شوید."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"نام کاربری (ایمیل)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"ورود به سیستم"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"نام کاربری یا گذرواژه نامعتبر."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"نام کاربری یا گذرواژه خود را فراموش کردید؟"\n"از "<b>"google.com/accounts/recovery"</b>" بازدید کنید."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"در حال بررسی..."</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"پین خود را <xliff:g id="NUMBER_0">%d</xliff:g> بار اشتباه تایپ کردید. "\n\n"پس از <xliff:g id="NUMBER_1">%d</xliff:g> ثانیه دوباره امتحان کنید."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"گذرواژه خود را <xliff:g id="NUMBER_0">%d</xliff:g> بار اشتباه تایپ کردید. "\n\n"پس از <xliff:g id="NUMBER_1">%d</xliff:g> ثانیه دوباره امتحان کنید."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%d</xliff:g> بار اشتباه کشیدید. "\n\n"لطفاً پس از <xliff:g id="NUMBER_1">%d</xliff:g> ثانیه دوباره امتحان کنید."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%d</xliff:g> بار اشتباه کشیدهاید. بعد از <xliff:g id="NUMBER_1">%d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب ایمیل قفل رایانه لوحی خود را باز کنید."\n\n" لطفاً پس از <xliff:g id="NUMBER_2">%d</xliff:g> ثانیه دوباره امتحان کنید."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"شما الگوی بازگشایی قفل خود را <xliff:g id="NUMBER_0">%d</xliff:g> بار اشتباه کشیدهاید. پس از <xliff:g id="NUMBER_1">%d</xliff:g> تلاش ناموفق، از شما خواسته میشود که با استفاده از یک حساب ایمیل قفل تلفن خود را باز کنید."\n\n" لطفاً پس از <xliff:g id="NUMBER_2">%d</xliff:g> ثانیه دوباره امتحان کنید."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"صدا به بالاتر از سطح ایمن افزایش یابد؟"\n"گوش دادن به صدای بلند برای زمانهای طولانی میتواند به شنوایی شما آسیب برساند."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"قابلیت دسترسی فعال شد."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index b4ba0217605b..a7dcd5e5ba32 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Antaa sovelluksen noutaa järjestelmän sisäisen tilan. Haitalliset sovellukset voivat noutaa paljon yksityisiä ja suojattuja tietoja, joita niiden ei pitäisi tarvita normaalisti."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"nouda näytön sisältö"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Antaa sovelluksen noutaa aktiivisen ikkunan sisällön. Haitalliset sovellukset voivat noutaa koko ikkunan sisällön ja tarkastella sen kaikkea tekstiä lukuun ottamatta salasanoja."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"ota esteettömyystila käyttöön väliaikaisesti"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Antaa sovelluksen ottaa esteettömyystilan käyttöön laitteessa väliaikaisesti. Haitalliset sovellukset voivat ottaa esteettömyystilan käyttöön ilman käyttäjän lupaa."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"nouda ikkunoiden tietoja"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Antaa sovelluksen noutaa ikkunoiden tietoja ikkunanhallinnasta. Haitalliset sovellukset voivat noutaa tietoja, jotka on tarkoitettu järjestelmän sisäiseen käyttöön."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"suodata tapahtumat"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Kuvio tyhjennetty"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Solu lisätty"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Kuvio valmis"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Salli"</string> <string name="sms_control_no" msgid="625438561395534982">"Kiellä"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> haluaa lähettää viestin osoitteeseen <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Matkapuhelinliittymäsi tiliä voidaan veloittaa."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Matkapuhelinliittymäsi tiliä veloitetaan."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Tämä "<font fgcolor="#ffffb060">"voi aiheuttaa kuluja"</font>" matkapuhelinliittymälaskuusi."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Tämä aiheuttaa kuluja matkapuhelinliittymälaskuusi."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Lähetä"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Peruuta"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Muista valintani"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Muuta kohd. Asetukset > Sovellukset"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Salli aina"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Älä koskaan salli"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kortti poistettu"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Puhelin"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Kuulokkeet"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Telineen kaiuttimet"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-ääni"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Järjestelmä"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-ääni"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Valmis"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Median äänentoisto"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Etsitään..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Yhdistetään..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Käytettävissä"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Ei käytettävissä"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Yhdysrakenteinen näyttö"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI-ruutu"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Peittokuva # <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Anna SIM-kortin PIN-koodi"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Anna PIN-koodi"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Anna salasana"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK-koodi"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Uusi PIN-koodi"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM-kortti on nyt poistettu käytöstä. Jatka antamalla PUK-koodi. Saat lisätietoja ottamalla yhteyttä operaattoriin."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Anna haluamasi PIN-koodi"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Vahvista haluamasi PIN-koodi"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM-kortin lukitusta poistetaan…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Virheellinen PIN-koodi."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Anna 4–8-numeroinen PIN-koodi."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Kirjoita vähintään 8 numeron pituinen PUK-koodi."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Anna PUK-koodi ja uusi PIN-koodi"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Antamasi PUK-koodi on virheellinen."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK-koodissa tulee olla vähintään 8 numeroa."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Anna uudelleen oikea PUK-koodi. Jos teet liian monta yritystä, SIM-kortti poistetaan käytöstä pysyvästi."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-koodit eivät täsmää"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Liikaa kuvionpiirtoyrityksiä"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Poista lukitus kirjautumalla sisään Google-tililläsi."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Käyttäjänimi (sähköposti)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Kirjaudu sisään"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Virheellinen käyttäjänimi tai salasana."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Unohditko käyttäjänimesi tai salasanasi?"\n"Käy osoitteessa "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Tarkistetaan..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"SIM-kortin lukitusta poistetaan…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Olet kirjoittanut PIN-koodin väärin <xliff:g id="NUMBER_0">%d</xliff:g> kertaa. "\n\n"Yritä uudelleen <xliff:g id="NUMBER_1">%d</xliff:g> sekunnin kuluttua."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Olet kirjoittanut salasanan väärin <xliff:g id="NUMBER_0">%d</xliff:g> kertaa. "\n\n"Yritä uudelleen <xliff:g id="NUMBER_1">%d</xliff:g> sekunnin kuluttua."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Olet piirtänyt lukituksenpoistokuvion väärin <xliff:g id="NUMBER_0">%d</xliff:g> kertaa. "\n\n"Yritä uudelleen <xliff:g id="NUMBER_1">%d</xliff:g> sekunnin kuluttua."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Piirsit lukituksenpoistokuvion väärin <xliff:g id="NUMBER_0">%d</xliff:g> kertaa. Jos piirrät kuvion väärin vielä <xliff:g id="NUMBER_1">%d</xliff:g> kertaa, sinua pyydetään poistamaan tablet-laitteesi lukitus sähköpostitilin avulla."\n\n" Yritä uudelleen <xliff:g id="NUMBER_2">%d</xliff:g> sekunnin kuluttua."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Piirsit lukituksenpoistokuvion väärin <xliff:g id="NUMBER_0">%d</xliff:g> kertaa. Jos piirrät kuvion väärin vielä <xliff:g id="NUMBER_1">%d</xliff:g> kertaa, sinua pyydetään poistamaan puhelimesi lukitus sähköpostitilin avulla."\n\n" Yritä uudelleen <xliff:g id="NUMBER_2">%d</xliff:g> sekunnin kuluttua."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Nostetaanko äänenvoimakkuus turvallista tasoa voimakkaammaksi?"\n"Jos kuuntelet suurella äänenvoimakkuudella pitkiä aikoja, kuulosi voi vahingoittua."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Esteettömyystila käytössä."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 1a109d069d38..d5c59f136dec 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Permet à l\'application de récupérer l\'état interne du système. Des applications malveillantes peuvent récupérer de nombreuses informations confidentielles et sécurisées dont elles ne devraient pas avoir besoin normalement."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"récupérer le contenu de l\'écran"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Permet à l\'application de récupérer le contenu de la fenêtre active. Des applications malveillantes peuvent exploiter cette fonctionnalité pour récupérer et lire la totalité du contenu de la fenêtre, à l\'exception des mots de passe."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"activer temporairement l\'accessibilité"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Permet à une application d\'activer temporairement l\'accessibilité sur l\'appareil. Des applications malveillantes peuvent activer l\'accessibilité sans le consentement de l\'utilisateur."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"récupérer les informations sur les fenêtres"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Permet à une application de récupérer les informations sur les fenêtres depuis le gestionnaire de fenêtres. Des applications malveillantes peuvent récupérer des informations destinées à un usage interne du système."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrer les événements"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Schéma effacé."</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Cellule ajoutée."</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Schéma terminé."</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Autoriser"</string> <string name="sms_control_no" msgid="625438561395534982">"Refuser"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> souhaite envoyer un message à <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Cela peut engendrer des frais sur votre facture mobile."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Cela va engendrer des frais sur votre facture mobile."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Ceci "<font fgcolor="#ffffb060">"peut entraîner des frais"</font>" sur votre compte mobile."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Ceci entraînera des frais sur votre compte mobile."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Envoyer"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Annuler"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Mémoriser mon choix"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Pour modifier : Paramètres > Applications"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Toujours autoriser"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Ne jamais autoriser"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Carte SIM retirée"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Téléphone"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Écouteurs"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Haut-parleurs de la station d\'accueil"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Système"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Audio Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"OK"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Sortie multimédia"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Analyse en cours..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Connexion en cours..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Disponible"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Indisponible"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Écran intégré"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Écran HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Superposition n° <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Saisissez le code PIN de la carte SIM."</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Saisissez le code PIN."</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Saisissez votre mot de passe."</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Clé PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Nouveau code PIN"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"La carte SIM est maintenant désactivée. Saisissez le code PUK pour continuer. Contactez votre opérateur pour en savoir plus."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Saisir le code PIN souhaité"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Confirmer le code PIN souhaité"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Déblocage de la carte SIM en cours…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Le code PIN est erroné."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Veuillez saisir un code PIN comprenant entre quatre et huit chiffres."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Veuillez saisir une clé PUK comportant au moins huit chiffres."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Saisissez la clé PUK et le nouveau code PIN"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"La clé PUK saisie est incorrecte."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Le code PUK doit contenir au moins 8 chiffres"</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Veuillez saisir de nouveau le code PUK correct. Des tentatives répétées désactivent définitivement la carte SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Les codes PIN ne correspondent pas."</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Trop de tentatives."</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Pour déverrouiller le téléphone, veuillez vous connecter avec votre compte Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nom d\'utilisateur (e-mail)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Connexion"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nom d\'utilisateur ou mot de passe non valide."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Vous avez oublié votre nom d\'utilisateur ou votre mot de passe ?"\n"Rendez-vous sur la page "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Vérification en cours…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Déblocage de la carte SIM en cours…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Vous avez saisi un code PIN incorrect à <xliff:g id="NUMBER_0">%d</xliff:g> reprises. "\n\n"Veuillez réessayer dans <xliff:g id="NUMBER_1">%d</xliff:g> secondes."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Vous avez saisi un mot de passe incorrect à <xliff:g id="NUMBER_0">%d</xliff:g> reprises. "\n\n"Veuillez réessayer dans <xliff:g id="NUMBER_1">%d</xliff:g> secondes."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Vous avez dessiné un schéma de déverrouillage incorrect à <xliff:g id="NUMBER_0">%d</xliff:g> reprises."\n\n"Veuillez réessayer dans <xliff:g id="NUMBER_1">%d</xliff:g> secondes."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Vous avez dessiné un schéma de déverrouillage incorrect à <xliff:g id="NUMBER_0">%d</xliff:g> reprises. Si vous échouez encore <xliff:g id="NUMBER_1">%d</xliff:g> fois, vous devrez déverrouiller votre tablette à l\'aide d\'un compte de messagerie électronique."\n\n" Veuillez réessayer dans <xliff:g id="NUMBER_2">%d</xliff:g> secondes."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Vous avez dessiné un schéma de déverrouillage incorrect à <xliff:g id="NUMBER_0">%d</xliff:g> reprises. Si vous échouez encore <xliff:g id="NUMBER_1">%d</xliff:g> fois, vous devrez déverrouiller votre téléphone à l\'aide d\'un compte de messagerie électronique."\n\n" Veuillez réessayer dans <xliff:g id="NUMBER_2">%d</xliff:g> secondes."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Augmenter le volume au-dessus du niveau de sécurité ?"\n"L\'écoute à un volume élevé pendant des périodes prolongées peut endommager votre audition."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"L\'accessibilité a bien été activée."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 556412da12a9..50d40ac400bb 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"एप्लिकेशन को सिस्टम की आंतरिक स्थिति पुनर्प्राप्त करने देता है. दुर्भावनापूर्ण एप्लिकेशन विभिन्न प्रकार की निजी और सुरक्षा जानकारी प्राप्त कर सकते हैं जिनकी उन्हें सामान्यत: आवश्यकता नहीं होती."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"स्क्रीन सामग्री पुनर्प्राप्त करें"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"एप्लिकेशन को सक्रिय विंडो की सामग्री पुनर्प्राप्त करने देता है. दुर्भावनापूर्ण एप्लिकेशन विंडो की संपूर्ण सामग्री प्राप्त कर सकते हैं और पासवर्ड को छोड़कर इसके सभी पाठ जांच सकते हैं."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"पहुंच-योग्यता को अस्थायी रूप से सक्षम करें"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"एप्लिकेशन को उपकरण पर पहुंच-योग्यता को अस्थायी रूप से सक्षम करने देता है. दुर्भावनापूर्ण एप्लिकेशन उपयोगकर्ता की सहमति के बिना पहुंच-योग्यता को सक्षम कर सकते हैं."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"विंडो जानकारी प्राप्त करें"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"एप्लिकेशन को विंडो प्रबंधक से windows के बारे में जानकारी प्राप्त करने देता है. दुर्भावनापूर्ण एप्लिकेशन आंतरिक सिस्टम उपयोग के लिए अभिप्रेत जानकारी को प्राप्त कर सकते हैं."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"ईवेंट फ़िल्टर करें"</string> @@ -324,7 +322,7 @@ <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"अनधिकृत विंडो दिखाएं"</string> <string name="permdesc_internalSystemWindow" msgid="7458387759461466397">"किसी एप्लिकेशन को ऐसी विंडो बनाने देता है जिनका उपयोग आंतरिक सिस्टम उपयोगकर्ता इंटरफ़ेस द्वारा किया जाना है. सामान्य एप्लिकेशन द्वारा उपयोग करने के लिए नहीं."</string> <string name="permlab_systemAlertWindow" msgid="3543347980839518613">"अन्य एप्लिकेशन पर खींचें"</string> - <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"एप्लिकेशन को अन्य एप्लिकेशन के शीर्ष पर या उपयोगकर्ता इंटरफ़ेस के भागों आने देती है. वे किसी भी एप्लिकेशन में इंटरफ़ेस के आपके उपयोग में हस्तक्षेप कर सकते हैं, या अन्य एप्लिकेशन में वह बदल सकती है जिसके बारे में आपको लगता है कि आप देख रहे हैं."</string> + <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"एप्लिकेशन को अन्य एप्लिकेशन के शीर्ष पर या उपयोगकर्ता इंटरफ़ेस के हिस्सों पर आने देती है. वे किसी भी एप्लिकेशन में इंटरफ़ेस के आपके उपयोग में हस्तक्षेप कर सकते हैं, या उस चीज को बदल सकती है जिसके बारे में आपको लगता है कि आप उसे अन्य एप्लिकेशन में देख रहे हैं."</string> <string name="permlab_setAnimationScale" msgid="2805103241153907174">"वैश्विक एनिमेशन गति बदलें"</string> <string name="permdesc_setAnimationScale" msgid="7690063428924343571">"एप्लिकेशन को किसी भी समय वैश्विक एनिमेशन गति (तेज़ या धीमे एनिमेशन) बदलने देता है."</string> <string name="permlab_manageAppTokens" msgid="1286505717050121370">"एप्लिकेशन टोकन प्रबंधित करें"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"प्रतिमान साफ़ किया गया"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"कक्ष जोड़ा गया"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"प्रतिमान पूरा किया गया"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"अनुमति दें"</string> <string name="sms_control_no" msgid="625438561395534982">"अस्वीकार करें"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>, <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> पर संदेश भेजना चाहता है."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"इससे आपके मोबाइल खाते पर शुल्क लग सकते हैं."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"इससे आपके मोबाइल खाते पर शुल्क लग सकते हैं."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"इससे आपके मोबाइल खाते पर "<font fgcolor="#ffffb060">"शुल्क लग सकते हैं"</font>"."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"इससे आपके मोबाइल खाते पर शुल्क लगेंगे."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"भेजें"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"रद्द करें"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"मेरी पसंद को याद रखें"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"आप इसे बाद में सेटिंग > एप्लिकेशन में बदल सकते हैं"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"हमेशा अनुमति दें"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"कभी भी अनुमति न दें"</string> <string name="sim_removed_title" msgid="6227712319223226185">"सिमकार्ड निकाला गया"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"फ़ोन"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"हेडफ़ोन"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"डॉक स्पीकर"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI ऑडियो"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"सिस्टम"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth ऑडियो"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"पूर्ण"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"मीडिया आउटपुट"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"स्कैन कर रहा है..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"कनेक्ट हो रहा है..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"उपलब्ध"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"उपलब्ध नहीं"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"अंतर्निहित स्क्रीन"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI स्क्रीन"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"ओवरले #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"सिम PIN डालें"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"PIN डालें"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"पासवर्ड डालें"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK कोड"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"नया PIN कोड"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"सिम अब अक्षम हो गई है. जारी रखने के लिए PUK कोड डालें. विवरण के लिए वाहक से संपर्क करें."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"इच्छित पिन कोड डालें"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"इच्छित पिन कोड की पुष्टि करें"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM कार्ड अनलॉक कर रहा है…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"गलत PIN कोड."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"ऐसा PIN लिखें, जो 4 से 8 अंकों का हो."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"ऐसा PUK लिखें जो 8 अंकों या अधिक का हो."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"PUK और नया PIN कोड लिखें"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"आपके द्वारा लिखा गया PUK सही नहीं है."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK कोड 8 या अधिक संख्या वाला होना चाहिए."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"सही PUK कोड पुन: डालें. बार-बार प्रयास करने से सिम स्थायी रूप से अक्षम हो जाएगी."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"पिन कोड का मिलान नहीं होता"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"बहुत अधिक प्रतिमान प्रयास"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"अनलॉक करने के लिए, अपने Google खाते से साइन इन करें."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"उपयोगकर्ता नाम (ईमेल)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"साइन इन करें"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"अमान्य उपयोगकर्ता नाम या पासवर्ड."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"अपना उपयोगकर्ता नाम या पासवर्ड भूल गए?"\n" "<b>"google.com/accounts/recovery"</b>" पर जाएं."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"जांच कर रहा है..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"सिम अनलॉक कर रहा है…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"आप अपना PIN <xliff:g id="NUMBER_0">%d</xliff:g> बार गलत तरीके से लिख चुके हैं. "\n\n" <xliff:g id="NUMBER_1">%d</xliff:g> सेकंड में पुन: प्रयास करें."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"आप अपना पासवर्ड <xliff:g id="NUMBER_0">%d</xliff:g> बार गलत तरीके से लिख चुके हैं. "\n\n" <xliff:g id="NUMBER_1">%d</xliff:g> सेकंड में पुन: प्रयास करें."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"आपने अपना अनलॉक प्रतिमान <xliff:g id="NUMBER_0">%d</xliff:g> बार गलत तरीके से आरेखित किया है. "\n\n" <xliff:g id="NUMBER_1">%d</xliff:g> सेकंड में पुन: प्रयास करें."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"आपने अपने अनलॉक प्रतिमान को <xliff:g id="NUMBER_0">%d</xliff:g> बार गलत तरीके से आरेखित किया है. <xliff:g id="NUMBER_1">%d</xliff:g> और असफल प्रयासों के बाद, आपसे अपने टेबलेट को किसी ईमेल खाते के उपयोग से अनलॉक करने के लिए कहा जाएगा."\n\n" <xliff:g id="NUMBER_2">%d</xliff:g> सेकंड में पुन: प्रयास करें."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"आपने अपने अनलॉक प्रतिमान को <xliff:g id="NUMBER_0">%d</xliff:g> बार गलत तरीके से आरेखित किया है. <xliff:g id="NUMBER_1">%d</xliff:g> और असफल प्रयासों के बाद, आपसे अपने फ़ोन को किसी ईमेल खाते का उपयोग करके अनलॉक करने के लिए कहा जाएगा."\n\n" <xliff:g id="NUMBER_2">%d</xliff:g> सेकंड में पुन: प्रयास करें."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"वॉल्यूम को सुरक्षित स्तर से अधिक करें?"\n"अधिक देर तक उच्च वॉल्यूम पर सुनने से आपकी सुनने की क्षमता को नुकसान हो सकता है."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"पहुंच-योग्यता सक्षम कर दी है."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 70cf7cc0bbfa..6a22d361d5dc 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Omogućuje aplikaciji dohvaćanje unutarnjeg stanja sustava. Zlonamjerne aplikacije mogu dohvatiti razne privatne i sigurnosne podatke koje im inače nikada ne bi trebale biti potrebne."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"dohvaćanje sadržaja zaslona"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Omogućuje aplikaciji dohvaćanje sadržaja aktivnog prozora. Zlonamjerne aplikacije mogu dohvatiti sav sadržaj prozora i pregledati sav njegov tekst osim zaporki."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"privremeno omogući dostupnost"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Aplikacija može privremeno omogućiti dostupnost na uređaju. Zlonamjerne aplikacije mogu omogućiti dostupnost bez korisnikova odobrenja."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"dohvaćanje informacija o prozoru"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Aplikaciji omogućuje dohvaćanje informacija o prozorima iz upravitelja prozora. Zlonamjerne aplikacije mogu dohvaćati informacije koje su namijenjene za internu uporabu sustava."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtriranje događaja"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Uzorak je obrisan"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Dodan je mobitel"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Uzorak je dovršen"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Dopusti"</string> <string name="sms_control_no" msgid="625438561395534982">"Odbij"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> želi poslati poruku na <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Vaš mobilni račun može biti terećen."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Vaš mobilni račun bit će terećen."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Ovo "<font fgcolor="#ffffb060">"će se možda naplaćivati"</font>" putem vašeg mobilnog računa."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Ovo se naplaćuje putem vašeg mobilnog računa."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Pošalji"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Odustani"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Zapamti odabir"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Kasnije to možete promijenili u odjeljku Postavke > Aplikacije"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Dopusti uvijek"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Ne dopuštaj nikada"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM kartica uklonjena"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Slušalice"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Zvučnici postolja"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI audio"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sustav"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth zvuk"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Gotovo"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Medijski izlaz"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Skeniranje..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Povezivanje..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Dostupno"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Nije dostupno"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Ugrađeni zaslon"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI zaslon"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Preklapanje br. <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Unesite PIN za SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Unesite PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Unesite zaporku"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK kôd"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Novi PIN kôd"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM je sad onemogućen. Unesite PUK kôd da biste nastavili. Kontaktirajte operatera za pojedinosti."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Upišite željeni PIN kôd"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Potvrdite željeni PIN kôd"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Otključavanje SIM kartice…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Netočan PIN kôd."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Unesite PIN koji ima od 4 do 8 brojeva."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Upišite PUK koji se sastoji od barem 8 brojeva."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Unesite PUK i novi PIN kôd"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"PUK koji ste unijeli nije točan."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK kôd treba imati 8 brojeva ili više."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Ponovo unesite ispravan PUK kôd. Ponovljeni pokušaji trajno će onemogućiti SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN kodovi nisu jednaki"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Previše pokušaja iscrtavanja obrasca"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Za otključavanje prijavite se Google računom."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Korisničko ime (e-pošta)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Prijava"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nevažeće korisničko ime ili zaporka."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Zaboravili ste korisničko ime ili zaporku?"\n"Posjetite "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Provjeravanje…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Otključavanje SIM-a…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Netočno ste napisali PIN <xliff:g id="NUMBER_0">%d</xliff:g> puta. "\n\n"Pokušajte ponovo za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Netočno ste napisali zaporku <xliff:g id="NUMBER_0">%d</xliff:g> puta. "\n\n"Pokušajte ponovo za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Netočno ste iscrtali obrazac za otključavanje <xliff:g id="NUMBER_0">%d</xliff:g> puta. "\n\n"Pokušajte ponovo za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Netočno ste iscrtali obrazac za otključavanje <xliff:g id="NUMBER_0">%d</xliff:g> puta. Nakon još ovoliko neuspješnih pokušaja: <xliff:g id="NUMBER_1">%d</xliff:g> morat ćete otključati tabletno računalo pomoću računa e-pošte."\n\n" Pokušajte ponovo za <xliff:g id="NUMBER_2">%d</xliff:g> s."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Netočno ste iscrtali obrazac za otključavanje <xliff:g id="NUMBER_0">%d</xliff:g> puta. Nakon još ovoliko neuspješnih pokušaja: <xliff:g id="NUMBER_1">%d</xliff:g> morat ćete otključati telefon pomoću računa e-pošte."\n\n" Pokušajte ponovo za <xliff:g id="NUMBER_2">%d</xliff:g> s."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Pojačati iznad sigurne razine?"\n"Dulje slušanje preglasne glazbe može vam oštetiti sluh."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Dostupnost je omogućena."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index 1009fa587128..f3eecc7ff6b8 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Lehetővé teszi az alkalmazás számára, hogy lekérje a rendszer belső állapotát. A rosszindulatú programok lekérhetnek számos olyan privát és biztonságos adatot, amelyekre normál esetben soha nincs szükségük."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"a képernyő tartalmának lekérése"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Lehetővé teszi az alkalmazás számára az aktív ablak tartalmának letöltését. A rosszindulatú alkalmazások letölthetik az ablak teljes tartalmát, és a jelszavak kivételével az összes szöveget megvizsgálhatják."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"Ideiglenes hozzáférés engedélyezése"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Engedélyezi egy alkalmazás számára, hogy ideiglenesen hozzáférést biztosítson az eszközhöz. A kártékony alkalmazások a felhasználó beleegyezése nélkül engedélyezhetik a hozzáférést."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"ablakkal kapcsolatos információk lekérése"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Lehetővé teszi, hogy az alkalmazás információkat kérjen le az ablakkezelőben lévő ablakokkal kapcsolatban. A rosszindulatú alkalmazások belső rendszerhasználathoz szükséges információkat kérhetnek le."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"események szűrése"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Minta törölve"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Cella hozzáadva"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Minta befejezve"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Engedélyezés"</string> <string name="sms_control_no" msgid="625438561395534982">"Elutasítás"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> üzenetet szeretne küldeni <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> számra."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Ezzel díjtételek keletkezhetnek mobilszámláján."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Ezzel díjtételek keletkeznek mobilszámláján."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Ezzel "<font fgcolor="#ffffb060">"díjtételek keletkezhetnek"</font>" mobilszámláján."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Ezzel díjtételek keletkeznek mobilszámláján."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Küldés"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Mégse"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"A választás mentése"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Módosítás: Beállítások > Alkalmazások"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Engedélyezés mindig"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Soha nem engedélyezem"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kártya eltávolítva"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Fejhallgató"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dokkolóegység hangszórója"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI audió"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Rendszer"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth hang"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Kész"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Médiakimenet"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Keresés..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Kapcsolódás..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Elérhető"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Nem érhető el"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Beépített képernyő"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI-képernyő"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"<xliff:g id="ID">%1$d</xliff:g>. fedvény"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Adja meg a SIM kártya PIN kódját"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Adja meg a PIN kódot"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Írja be a jelszót"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK kód"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Új PIN kód"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"A SIM kártya le van tiltva. A folytatáshoz adja meg a PUK kódot. A részletekért vegye fel a kapcsolatot szolgáltatójával."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Kívánt PIN kód megadása"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Kívánt PIN kód megerősítése"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM kártya feloldása..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Helytelen PIN kód."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"4–8 számjegyű PIN kódot írjon be."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"8 számjegyű vagy hosszabb PUK kódot írjon be."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Írja be a PUK kódot, majd az új PIN kódot"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"A megadott PUK kód helytelen."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"A PUK kód legalább 8 számjegyből kell, hogy álljon."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Adja meg újra a helyes PUK kódot. Az ismételt próbálkozással véglegesen letiltja a SIM kártyát."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"A PIN kódok nem egyeznek."</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Túl sok mintarajzolási próbálkozás"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"A feloldáshoz jelentkezzen be Google Fiókjával."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Felhasználónév (e-mail cím)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Bejelentkezés"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Érvénytelen felhasználónév vagy jelszó."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Elfelejtette a felhasználónevét vagy jelszavát?"\n"Keresse fel a "<b>"google.com/accounts/recovery"</b>" webhelyet."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Ellenőrzés..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"SIM kártya feloldása..."</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"<xliff:g id="NUMBER_0">%d</xliff:g> alkalommal helytelenül adta meg PIN kódját. "\n\n"Próbálja újra <xliff:g id="NUMBER_1">%d</xliff:g> másodperc múlva."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"<xliff:g id="NUMBER_0">%d</xliff:g> alkalommal helytelenül adta meg a jelszót. "\n\n" Próbálja újra <xliff:g id="NUMBER_1">%d</xliff:g> másodperc múlva."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"<xliff:g id="NUMBER_0">%d</xliff:g> alkalommal rosszul rajzolta le feloldási mintát. "\n\n"Próbálja újra <xliff:g id="NUMBER_1">%d</xliff:g> másodperc múlva."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"<xliff:g id="NUMBER_0">%d</xliff:g> alkalommal helytelenül rajzolta le a feloldási mintát. További <xliff:g id="NUMBER_1">%d</xliff:g> sikertelen kísérlet után egy e-mail fiók használatával kell feloldania a táblagépét."\n\n" Kérjük, próbálja újra <xliff:g id="NUMBER_2">%d</xliff:g> másodperc múlva."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"<xliff:g id="NUMBER_0">%d</xliff:g> alkalommal helytelenül rajzolta le a feloldási mintát. További <xliff:g id="NUMBER_1">%d</xliff:g> sikertelen kísérlet után egy e-mail fiók használatával kell feloldania a telefonját."\n\n" Kérjük, próbálja újra <xliff:g id="NUMBER_2">%d</xliff:g> másodperc múlva."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"A biztonságos szint fölé emeli a hangerőt?"\n"Ha hosszú ideig hangosan hallgatja a zenét, az károsíthatja a hallását."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Hozzáférés engedélyezve"</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 132e634d47f9..5d0a6e01c09e 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Mengizinkan apl mengambil keadaan internal sistem. Apl berbahaya dapat mengambil berbagai informasi pribadi dan aman yang seharusnya tidak diperlukan."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"ambil konten layar"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Mengizinkan apl mengambil konten jendela aktif. Apl berbahaya dapat mengambil seluruh konten jendela dan memeriksa semua teksnya kecuali sandi."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"aktifkan aksesibilitas untuk sementara"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Memungkinkan aplikasi mengaktifkan aksesibilitas pada perangkat untuk sementara. Aplikasi berbahaya dapat mengaktifkan aksesibilitas tanpa izin pengguna."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"mengambil info jendela"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Mengizinkan aplikasi mengambil informasi tentang jendela dari pengelola jendela. Aplikasi berbahaya dapat mengambil informasi yang ditujukan untuk penggunaan sistem internal."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"memfilter acara"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Pola dihapus"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Sel ditambahkan"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Pola selesai"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Izinkan"</string> <string name="sms_control_no" msgid="625438561395534982">"Tolak"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ingin mengirim pesan kepada <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Ini dapat menyebabkan tagihan pada akun seluler Anda."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Ini akan menyebabkan tagihan pada akun seluler Anda."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Kirim"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Batal"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Ingat pilihan saya"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Selalu Izinkan"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Jangan Pernah Izinkan"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Kartu SIM dihapus"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Ponsel"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Headphone"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Pengeras suara dok"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistem"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Audio Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Selesai"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Keluaran media"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Layar Bawaan"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Layar HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Hamparan #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Masukkan PIN SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Masukkan PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Masukkan Sandi"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Kode PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Kode PIN baru"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Membuka kunci kartu SIM…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Kode PIN salah."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Ketik PIN yang terdiri dari 4 sampai 8 angka."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Ketik PUK yang terdiri dari 8 angka atau lebih."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Ketik kode PUK dan PIN baru"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"PUK yang Anda ketikkan salah."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Terlalu banyak upaya pola"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Untuk membuka kunci, masuk dengan akun Google Anda."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nama pengguna (email)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Masuk"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nama pengguna atau sandi tidak valid."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Lupa nama pengguna atau sandi Anda?"\n"Kunjungi "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Memeriksa…"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Anda telah <xliff:g id="NUMBER_0">%d</xliff:g> kali salah mengetik PIN. "\n\n"Coba lagi dalam <xliff:g id="NUMBER_1">%d</xliff:g> detik."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Anda telah <xliff:g id="NUMBER_0">%d</xliff:g> kali salah mengetik sandi. "\n\n"Coba lagi dalam <xliff:g id="NUMBER_1">%d</xliff:g> detik."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Anda telah <xliff:g id="NUMBER_0">%d</xliff:g> kali salah menggambar pola pembuka kunci. "\n\n"Coba lagi dalam <xliff:g id="NUMBER_1">%d</xliff:g> detik."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Anda telah <xliff:g id="NUMBER_0">%d</xliff:g> kali salah menggambar pola pembuka kunci. Setelah <xliff:g id="NUMBER_1">%d</xliff:g> lagi upaya gagal, Anda akan diminta membuka kunci tablet menggunakan akun email."\n\n"Coba lagi dalam <xliff:g id="NUMBER_2">%d</xliff:g> detik."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Anda telah <xliff:g id="NUMBER_0">%d</xliff:g> kali salah menggambar pola pembuka kunci. Setelah <xliff:g id="NUMBER_1">%d</xliff:g> lagi upaya gagal, Anda akan diminta membuka kunci ponsel menggunakan akun email."\n\n"Coba lagi dalam <xliff:g id="NUMBER_2">%d</xliff:g> detik."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Naikkan volume di atas tingkat aman?"\n"Mendengarkan volume tinggi dalam jangka waktu yang lama dapat merusak pendengaran Anda."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Aksesibilitas diaktifkan."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 1ddbb5978f7c..5dd161cc08a8 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Consente all\'applicazione di recuperare lo stato interno del sistema. Le applicazioni dannose potrebbero recuperare una vasta gamma di informazioni private e protette di cui normalmente non dovrebbero mai avere bisogno."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"recupero dei contenuti della schermata"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Consente all\'applicazione di recuperare i contenuti della finestra attiva. Le applicazioni dannose potrebbero recuperare l\'intero contenuto della finestra ed esaminare tutto il testo, tranne le password."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"attivazione temporanea dell\'accessibilità"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Consente a un\'applicazione di attivare temporaneamente l\'accessibilità sul dispositivo. Le applicazioni dannose potrebbero attivare l\'accessibilità senza il consenso dell\'utente."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"recupero di informazioni sulle finestre"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Consente a un\'applicazione di recuperare informazioni sulle finestre dalla gestione finestre. Le applicazioni dannose potrebbero recuperare informazioni destinate all\'utilizzo da parte del sistema interno."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtro eventi"</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Sequenza cancellata"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Cella aggiunta"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Sequenza completata"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Widget %2$d di %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Selettore utente"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Stato"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Controlli media"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1103,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Consenti"</string> <string name="sms_control_no" msgid="625438561395534982">"Nega"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vorrebbe inviare un messaggio a <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Potrebbero essere addebitati dei costi sul tuo account mobile."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Verranno addebitati dei costi sul tuo account mobile."</string> + <string name="sms_short_code_details" msgid="3492025719868078457"><font fgcolor="#ffffb060">"Potrebbero essere effettuati addebiti"</font>" sul tuo account per cellulari."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Verranno effettuati addebiti sul tuo account per cellulari."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Invia"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Annulla"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Memorizza la mia scelta"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Modifica: Impostazioni > Applicazioni"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Consenti sempre"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Non consentire mai"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Scheda SIM rimossa"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefono"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Cuffie audio"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altoparlanti dock"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Audio Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Fine"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Uscita media"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Ricerca in corso..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Connessione..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Disponibile"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Non disponibili"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Schermo incorporato"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Schermo HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Overlay n. <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Inserisci il PIN della SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Inserisci PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Inserisci la password"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Codice PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Nuovo codice PIN"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"La scheda SIM è disattivata. Inserisci il codice PUK per continuare. Contatta l\'operatore per avere informazioni dettagliate."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Inserisci il codice PIN desiderato"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Conferma il codice PIN desiderato"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Sblocco scheda SIM..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Codice PIN errato."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Il PIN deve essere di 4-8 numeri."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Digita un PUK formato da almeno 8 numeri."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Inserisci il PUK e il nuovo codice PIN"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Il PUK digitato è errato."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Il codice PUK dovrebbe avere almeno otto numeri."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Inserisci di nuovo il codice PUK corretto. Ripetuti tentativi comportano la disattivazione definitiva della scheda SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"I codici PIN non corrispondono"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Troppi tentativi di inserimento della sequenza"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Per sbloccare, accedi con il tuo account Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nome utente (email)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Accedi"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nome utente o password non validi."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Hai dimenticato il nome utente o la password?"\n"Visita "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Verifica…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Sblocco SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Hai digitato il tuo PIN <xliff:g id="NUMBER_0">%d</xliff:g> volte in modo errato. "\n\n"Riprova tra <xliff:g id="NUMBER_1">%d</xliff:g> secondi."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Hai digitato la tua password <xliff:g id="NUMBER_0">%d</xliff:g> volte in modo errato. "\n\n"Riprova tra <xliff:g id="NUMBER_1">%d</xliff:g> secondi."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"<xliff:g id="NUMBER_0">%d</xliff:g> tentativi errati di inserimento della sequenza di sblocco. "\n\n"Riprova tra <xliff:g id="NUMBER_1">%d</xliff:g> secondi."</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"<xliff:g id="NUMBER_0">%d</xliff:g> tentativi errati di inserimento della sequenza di sblocco. Dopo altri <xliff:g id="NUMBER_1">%d</xliff:g> tentativi falliti, ti verrà chiesto di sbloccare il tablet con un account email."\n\n" Riprova tra <xliff:g id="NUMBER_2">%d</xliff:g> secondi."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"<xliff:g id="NUMBER_0">%d</xliff:g> tentativi errati di inserimento della sequenza di sblocco. Dopo altri <xliff:g id="NUMBER_1">%d</xliff:g> tentativi falliti, ti verrà chiesto di sbloccare il telefono con un account email."\n\n" Riprova tra <xliff:g id="NUMBER_2">%d</xliff:g> secondi."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Aumentare il volume oltre il livello di sicurezza?"\n"Ascoltare musica ad alto volume per lunghi periodi potrebbe danneggiare l\'udito."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"Continua a tenere premuto con due dita per attivare l\'accessibilità."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"Accessibilità attivata."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Accessibilità annullata."</string> + <string name="user_switched" msgid="3768006783166984410">"Utente corrente <xliff:g id="NAME">%1$s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 95a938a609a4..041d8f4c8afc 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"מאפשר ליישום לאחזר את המצב הפנימי של המערכת. יישומים זדוניים עלולים לאחזר מגוון רחב של מידע אישי ונתוני אבטחה, שעל פי רוב לעולם לא יזדקקו להם."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"אחזר את תוכן המסך"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"מאפשר ליישום לאחזר את התוכן של החלון הפעיל. יישומים זדוניים עלולים לאחזר את תוכן החלון כולו ולבחון את כל הטקסט שבו, מלבד סיסמאות."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"הפעלת נגישות זמנית"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"מאפשר ליישום להפעיל באופן זמני נגישות במכשיר. יישומים זדוניים עלולים לאפשר נגישות ללא הסכמת משתמש."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"אחזר מידע חלון"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"מאפשר ליישום לאחזר מידע לגבי החלונות ממנהל החלונות. יישומים זדוניים עשויים לאחזר מידע המיועד לשימוש מערכת פנימי."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"סנן אירועים"</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"התבנית נמחקה"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"התא נוסף"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"התבנית הושלמה"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Widget %2$d מתוך %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"בוחר משתמשים"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"סטטוס"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"פקדי מדיה"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"אבג"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1103,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"אפשר"</string> <string name="sms_control_no" msgid="625438561395534982">"דחה"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> רוצה לשלוח הודעה אל <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"הדבר עשוי לגרום לחיובים בחשבון שלך לנייד."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"הדבר יגרום לחיובים בחשבון שלך לנייד."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"הפעולה "<font fgcolor="#ffffb060">"עשויה לגרום לחיובים"</font>" בחשבון המכשיר הנייד שלך."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"הפעולה תגרום לחיובים בחשבון המכשיר הנייד שלך."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"שלח"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"בטל"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"זכור את הבחירה שלי"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"ניתן לשנות זאת מאוחר יותר ב\'הגדרות\' > \'יישומים\'"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"אפשר תמיד"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"לעולם אל תאפשר"</string> <string name="sim_removed_title" msgid="6227712319223226185">"כרטיס ה-SIM הוסר"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"טלפון"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"אוזניות"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"רמקולים של מעגן"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"אודיו HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"מערכת"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"אודיו Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"סיום"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"פלט מדיה"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"סורק..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"מתחבר..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"זמין"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"לא זמין"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"מסך מובנה"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"מסך HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"שכבת על #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"הזן מספר PIN ל-SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"הזן מספר PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"הזן את הסיסמה"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"קוד PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"קוד PIN חדש"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"כרטיס ה-SIM מושבת כעת. הזן קוד PUK כדי להמשיך. פנה אל הספק לפרטים."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"הזן את קוד ה-PIN הרצוי"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"אשר את קוד ה-PIN הרצוי"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"מבטל נעילה של כרטיס SIM…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"קוד PIN שגוי."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"הקלד מספר PIN שאורכו 4 עד 8 ספרות."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"הקלד PUK באורך 8 ספרות או יותר."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"הקלד את קוד ה-PUK וקוד ה-PIN החדש"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"ה-PUK שהקלדת שגוי."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"קוד PUK צריך להיות בן 8 ספרות או יותר."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"הזן מחדש את קוד PUK הנכון. ניסיונות חוזרים ישביתו לצמיתות את כרטיס ה-SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"קודי ה-PIN אינם תואמים"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"ניסיונות רבים מדי לשרטוט קו ביטול נעילה."</string> <string name="kg_login_instructions" msgid="1100551261265506448">"כדי לבטל את הנעילה, היכנס באמצעות חשבון Google שלך."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"שם משתמש (דוא\"ל)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"היכנס"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"שם משתמש או סיסמה לא חוקיים."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"שכחת את שם המשתמש או הסיסמה?"\n"בקר בכתובת "<b>"google.com/accounts/recovery"</b></string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"בודק…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"משחרר כרטיס SIM ..."</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"הקלדת מספר PIN שגוי <xliff:g id="NUMBER_0">%d</xliff:g> פעמים. "\n\n"נסה שוב בעוד <xliff:g id="NUMBER_1">%d</xliff:g> שניות."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"הקלדת סיסמה שגויה <xliff:g id="NUMBER_0">%d</xliff:g> פעמים."\n\n"נסה שוב בעוד <xliff:g id="NUMBER_1">%d</xliff:g> שניות."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"שרטטת את קו ביטול הנעילה באופן שגוי <xliff:g id="NUMBER_0">%d</xliff:g> פעמים. "\n\n"נסה שוב בעוד <xliff:g id="NUMBER_1">%d</xliff:g> שניות."</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"שרטטת את קו ביטול הנעילה באופן שגוי <xliff:g id="NUMBER_0">%d</xliff:g> פעמים. לאחר <xliff:g id="NUMBER_1">%d</xliff:g> ניסיונות כושלים נוספים, תתבקש לבטל את נעילת הטאבלט באמצעות חשבון דוא\"ל."\n\n"נסה שוב בעוד <xliff:g id="NUMBER_2">%d</xliff:g> שניות."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"שרטטת את קו ביטול הנעילה באופן שגוי <xliff:g id="NUMBER_0">%d</xliff:g> פעמים. לאחר <xliff:g id="NUMBER_1">%d</xliff:g> ניסיונות כושלים נוספים, תתבקש לבטל את נעילת הטלפון באמצעות חשבון דוא\"ל."\n\n"נסה שוב בעוד <xliff:g id="NUMBER_2">%d</xliff:g> שניות."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"האם להעלות את עוצמת הקול מעל לרמה הבטוחה?"\n"האזנה בעוצמת קול גבוהה למשך זמן ארוך עלולה לפגוע בשמיעה."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"המשך לגעת בשתי אצבעות כדי להפעיל נגישות."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"נגישות הופעלה."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"נגישות בוטלה."</string> + <string name="user_switched" msgid="3768006783166984410">"המשתמש הנוכחי <xliff:g id="NAME">%1$s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 61c925dad47a..de53bb98ef8b 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"システムの内部状態の取得をアプリに許可します。この許可を悪意のあるアプリに利用されると、通常必要ないはずの各種の非公開/機密情報が取得される恐れがあります。"</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"画面のコンテンツの取得"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"作業中のウィンドウの内容を取得することをアプリに許可します。この許可を悪意のあるアプリに利用されると、ウィンドウの内容全体が取得されてパスワード以外のテキストがすべてチェックされる恐れがあります。"</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"ユーザー補助を一時的に有効にする"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"この端末のユーザー補助を一時的に有効にすることをアプリに許可します。悪意のあるアプリはユーザーの同意を得ずにユーザー補助を有効にする場合があります。"</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"ウィンドウ情報の取得"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"ウィンドウマネージャからウィンドウに関する情報を取得することをアプリに許可します。悪意のあるアプリが内部システムの利用を目的に情報を取得する恐れがあります。"</string> <string name="permlab_filter_events" msgid="8675535648807427389">"イベントのフィルタリング"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"パターンを消去しました"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"セルを追加しました"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"パターンの描画が完了しました"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"許可する"</string> <string name="sms_control_no" msgid="625438561395534982">"許可しない"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>が、<b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>にメッセージを送信しようとしています。"</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"モバイルアカウントへの請求が発生する場合があります。"</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"モバイルアカウントへの請求が発生します。"</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"送信"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"キャンセル"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"この選択を保存"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"常に許可する"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"許可しない"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIMカードが取り外されました"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"携帯端末"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"ヘッドホン"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"ホルダーのスピーカー"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMIオーディオ"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"システム"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth音声"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"完了"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"メディア出力"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"内蔵スクリーン"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI画面"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"オーバーレイ第<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"SIM PINを入力"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"PINを入力"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"パスワードを入力"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUKコード"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"新しいPINコード"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIMカードのロック解除中…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"PINコードが正しくありません。"</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"PINは4～8桁の数字で入力してください。"</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"PUKは8桁以上で入力してください。"</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"PUKと新しいPINコードを入力"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"入力したPUKは正しくありません。"</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"パターンの入力を所定の回数以上間違えました。"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"ロックを解除するにはGoogleアカウントでログインしてください。"</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"ユーザー名（メール）"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"ログイン"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"ユーザー名またはパスワードが無効です。"</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"ユーザー名またはパスワードを忘れた場合は"\n" "<b>"google.com/accounts/recovery"</b>" にアクセスしてください。"</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"チェックしています…"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"PINの入力を<xliff:g id="NUMBER_0">%d</xliff:g>回間違えました。"\n\n"<xliff:g id="NUMBER_1">%d</xliff:g>秒以内にもう一度お試しください。"</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"パスワードの入力を<xliff:g id="NUMBER_0">%d</xliff:g>回間違えました。"\n\n"<xliff:g id="NUMBER_1">%d</xliff:g>秒以内にもう一度お試しください。"</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"ロック解除パターンの入力を<xliff:g id="NUMBER_0">%d</xliff:g>回間違えました。"\n\n"<xliff:g id="NUMBER_1">%d</xliff:g>秒以内にもう一度お試しください。"</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"ロック解除パターンの入力を<xliff:g id="NUMBER_0">%d</xliff:g>回間違えました。あと<xliff:g id="NUMBER_1">%d</xliff:g>回間違えると、タブレットのロック解除にメールアカウントが必要になります。"\n\n"<xliff:g id="NUMBER_2">%d</xliff:g>秒以内にもう一度お試しください。"</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"ロック解除パターンの入力を<xliff:g id="NUMBER_0">%d</xliff:g>回間違えました。あと<xliff:g id="NUMBER_1">%d</xliff:g>回間違えると、携帯端末のロック解除にメールアカウントが必要になります。"\n\n"<xliff:g id="NUMBER_2">%d</xliff:g>秒以内にもう一度お試しください。"</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"安全レベルを超えるまで音量を上げますか？"\n"大音量で長時間聞き続けると、聴力を損なう恐れがあります。"</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"ユーザー補助が有効になりました。"</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 6285bc2d1e9a..bc165b972630 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"앱이 시스템의 내부 상태를 검색할 수 있도록 허용합니다. 이 경우 악성 앱이 이 기능을 이용하여 일반적으로 필요하지 않은 다양한 개인정보와 보안정보를 검색할 수 있습니다."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"화면 콘텐츠 검색"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"앱이 활성 창의 콘텐츠를 검색할 수 있도록 허용합니다. 이 경우 악성 앱이 전체 창의 콘텐츠를 검색하여 비밀번호를 제외한 모든 텍스트를 살펴볼 수 있습니다."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"일시적인 접근성 사용"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"애플리케이션이 기기에서 일시적으로 접근성을 사용하도록 허용합니다. 이 경우 악성 앱이 사용자의 동의 없이 접근성을 사용할 수 있습니다."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"창 관련 정보 가져오기"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"애플리케이션이 Window Manager에서 창 관련 정보를 가져오도록 허용합니다. 이 경우 악성 앱이 내부 시스템에서만 사용하도록 되어 있는 정보를 가져올 수 있습니다."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"일정 필터링"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"패턴 삭제"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"셀 추가됨"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"패턴 완료"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"허용"</string> <string name="sms_control_no" msgid="625438561395534982">"거부"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>(으)로 메시지를 보내시겠습니까?"</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"모바일 계정에 요금이 청구됩니다."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"모바일 계정에 요금이 청구됩니다."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"전송"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"취소"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"내 선택사항 기억"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"항상 허용"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"허용 안함"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM 카드 제거됨"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"휴대전화"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"헤드폰"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"도크 스피커"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI 오디오"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"시스템"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"블루투스 오디오"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"완료"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"미디어 출력"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"기본으로 제공되는 화면"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI 화면"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"<xliff:g id="ID">%1$d</xliff:g>번째 오버레이"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"SIM PIN 입력"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"PIN 입력"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"비밀번호 입력"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK 코드"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"새 PIN 코드"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM 카드 잠금해제 중..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"PIN 코드가 잘못되었습니다."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"4~8자리 숫자로 된 PIN을 입력하세요."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"8자리 이상의 숫자 PUK를 입력합니다."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"PUK 및 새 PIN 코드 입력"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"입력한 PUK가 올바르지 않습니다."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"패턴 시도 횟수가 너무 많음"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"잠금해제하려면 Google 계정으로 로그인하세요."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"사용자 이름(이메일)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"로그인"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"사용자 이름 또는 비밀번호가 잘못되었습니다."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"사용자 이름이나 비밀번호를 잊어버렸습니까?"\n<b>"google.com/accounts/recovery"</b>" 페이지를 방문하세요."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"확인 중…"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"PIN을 <xliff:g id="NUMBER_0">%d</xliff:g>회 잘못 입력했습니다. "\n\n"<xliff:g id="NUMBER_1">%d</xliff:g>초 후에 다시 시도해 주세요."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"비밀번호를 <xliff:g id="NUMBER_0">%d</xliff:g>회 잘못 입력했습니다. "\n\n"<xliff:g id="NUMBER_1">%d</xliff:g>초 후에 다시 시도해 주세요."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"잠금해제 패턴을 <xliff:g id="NUMBER_0">%d</xliff:g>회 잘못 그렸습니다. "\n\n"<xliff:g id="NUMBER_1">%d</xliff:g>초 후에 다시 시도해 주세요."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"잠금해제 패턴을 <xliff:g id="NUMBER_0">%d</xliff:g>회 잘못 그렸습니다. <xliff:g id="NUMBER_1">%d</xliff:g>회 더 실패하면 이메일 계정을 사용하여 태블릿을 잠금해제해야 합니다."\n\n" <xliff:g id="NUMBER_2">%d</xliff:g>초 후에 다시 시도해 주세요."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"잠금해제 패턴을 <xliff:g id="NUMBER_0">%d</xliff:g>회 잘못 그렸습니다. <xliff:g id="NUMBER_1">%d</xliff:g>회 더 실패하면 이메일 계정을 사용하여 휴대전화를 잠금해제해야 합니다."\n\n" <xliff:g id="NUMBER_2">%d</xliff:g>초 후에 다시 시도해 주세요."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"안전한 수준 이상으로 볼륨을 높이시겠습니까?"\n"높은 볼륨으로 장시간 청취하면 청력에 손상이 올 수 있습니다."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"접근성을 사용 설정했습니다."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index ffe374e772f4..03fd5845ba4b 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Leidžiama programai nuskaityti vidinę sistemos būseną. Kenkėjiškos programos gali nuskaityti daug įvairios privačios ir saugios informacijos, kurios paprastai joms niekada neturėtų reikėti."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"nuskaityti ekrano turinį"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Leidžiama programai nuskaityti aktyvaus lango turinį. Kenkėjiškos programos gali bandyti išgauti viso lango turinį ir tirti visą jo tekstą, išskyrus slaptažodžius."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"laikinai įgalinti pritaikymą neįgaliesiems"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Leidžiama programai laikinai įgalinti pritaikymą neįgaliesiems įrenginyje. Kenkėjiškos programos pritaikymą neįgaliesiems gali įgalinti be naudotojo sutikimo."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"gauti lango informaciją"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Leidžiama programai iš langų tvarkytuvės gauti informaciją apie langus. Kenkėjiškos programos gali gauti informaciją, kuri skirta naudoti sistemos viduje."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrų įvykiai"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Šablonas išvalytas"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Pridėtas langelis"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Šablonas užbaigtas"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Leisti"</string> <string name="sms_control_no" msgid="625438561395534982">"Uždrausti"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> norėtų išsiųsti pranešimą šiuo adresu: <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Dėl to gali būti apmokestinta paskyra mobiliesiems."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Dėl to bus apmokestinta paskyra mobiliesiems."</string> + <string name="sms_short_code_details" msgid="3492025719868078457"><font fgcolor="#ffffb060">"Gali būti taikomi mokesčiai"</font>" paskyroje mobiliesiems."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Bus taikomi mokesčiai paskyroje mobiliesiems."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Siųsti"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Atšaukti"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Atsiminti mano pasirinkimą"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Tai vėliau galėsite pakeisti skiltyje „Nustatymai“ > „Programos“"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Visada leisti"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Niekada neleisti"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM kortelė pašalinta"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefonas"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Ausinės"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Doko garsiakalbiai"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI garsas"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"„Bluetooth“ garsas"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Atlikta"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Medijos išvestis"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Nuskaitoma..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Jungiama..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Pasiekiama"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Nepasiekiama"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Integruotas ekranas"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI ekranas"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Perdanga nr. <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Įveskite SIM PIN kodą"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Įveskite PIN kodą"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Įveskite slaptažodį"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK kodas"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Naujas PIN kodas"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Dabar SIM neleidžiama. Jei norite tęsti, įveskite PUK kodą. Jei reikia išsamios informacijos, susisiekite su operatoriumi."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Įveskite pageidaujamą PIN kodą"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Patvirtinkite pageidaujamą PIN kodą"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Atrakinama SIM kortelė…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Netinkamas PIN kodas."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Įveskite PIN kodą, sudarytą iš 4–8 skaičių."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Įveskite 8 skaitmenų ar ilgesnį PUK kodą."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Įveskite PUK ir naują PIN kodus"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Įvestas PUK kodas netinkamas."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK kodas turėtų būti mažiausiai 8 skaitmenų."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Pakartotinai įveskite tinkamą PUK kodą. Pakartotinai bandant bus visam laikui neleidžiama SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN kodai neatitinka"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Per daug atrakinimo piešinių bandymų"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Jei norite atrakinti, prisijunkite naudodami „Google“ paskyrą."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Naudotojo vardas (el. paštas)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Prisijungti"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Netinkamas naudotojo vardas ar slaptažodis."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Pamiršote naudotojo vardą ar slaptažodį?"\n"Apsilankykite šiuo adresu: "<b>"google.com/accounts/recovery"</b></string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Tikrinama…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Atrakinama SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"PIN kodą netinkamai įvedėte <xliff:g id="NUMBER_0">%d</xliff:g> k. "\n\n"Bandykite dar kartą po <xliff:g id="NUMBER_1">%d</xliff:g> sek."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Neteisingai įvedėte slaptažodį <xliff:g id="NUMBER_0">%d</xliff:g> k. "\n\n"Bandykite dar kartą po <xliff:g id="NUMBER_1">%d</xliff:g> sek."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Netinkamai nupiešėte atrakinimo piešinį <xliff:g id="NUMBER_0">%d</xliff:g> k. "\n\n"Bandykite dar kartą po <xliff:g id="NUMBER_1">%d</xliff:g> sek."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Netinkamai nupiešėte atrakinimo piešinį <xliff:g id="NUMBER_0">%d</xliff:g> k. Po dar <xliff:g id="NUMBER_1">%d</xliff:g> nesėkm. band. būsite paprašyti atrakinti planšetinį kompiuterį naudodami „Google“ prisijungimo duomenis."\n\n" Bandykite dar kartą po <xliff:g id="NUMBER_2">%d</xliff:g> sek."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Netinkamai nupiešėte atrakinimo piešinį <xliff:g id="NUMBER_0">%d</xliff:g> k. Po dar <xliff:g id="NUMBER_1">%d</xliff:g> nesėkm. band. būsite paprašyti atrakinti telefoną naudodami „Google“ prisijungimo duomenis."\n\n" Bandykite dar kartą po <xliff:g id="NUMBER_2">%d</xliff:g> sek."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Padidinti garsumą viršijant saugų lygį?"\n"Ilgai klausantis dideliu garsumu gali sutrikti klausa."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Pritaikymas neįgaliesiems įgalintas."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index d1266c61a408..b54c04dfdf31 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Ļauj lietotnei izgūt sistēmas iekšējo statusu. Ļaunprātīgas lietotnes var izgūt dažādu privātu un drošu informāciju, kas parasti tām nav nepieciešama."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"Ekrāna satura iegūšana"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Ļauj lietotnei izgūt aktīva loga saturu. Ļaunprātīgas lietotnes var izgūt visu loga saturu un pārbaudīt visu tā tekstu, izņemot paroles."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"Īslaicīga pieejamības režīma iespējošana"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Ļauj lietojumprogrammai īslaicīgi ierīcē iespējot pieejamības režīmu. Ļaunprātīgas lietotnes var iespējot pieejamības režīmu bez lietotāja atļaujas."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"Izgūt informāciju par logiem"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Ļauj lietojumprogrammai no logu pārvaldnieka izgūt informāciju par logiem. Ļaunprātīgas lietotnes var izgūt informāciju, kas ir paredzēta iekšējai izmantošanai sistēmā."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"Filtrēt notikumus"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Kombinācija notīrīta"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Šūna pievienota"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Kombinācija pabeigta"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Atļaut"</string> <string name="sms_control_no" msgid="625438561395534982">"Aizliegt"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vēlas sūtīt īsziņu adresātam <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"No jūsu mobilās ierīces konta var tikt iekasēta maksa."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"No jūsu mobilās ierīces konta tiks iekasēta maksa."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"No jūsu mobilās ierīces konta "<font fgcolor="#ffffb060">"var tikt iekasēta maksa"</font>"."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"No jūsu mobilās ierīces konta tiks iekasēta maksa."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Sūtīt"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Atcelt"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Atcerēties manu izvēli"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Lai mainītu: Iestatījumi > Lietotnes"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Vienmēr atļaut"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Neatļaut nekad"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM karte ir izņemta."</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Tālrunis"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Austiņas"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Doka skaļruņi"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI audio"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistēma"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth audio"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Gatavs"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Multivides izeja"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Notiek meklēšana..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Notiek savienojuma izveide..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Pieejams"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Nav pieejams"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Iebūvēts ekrāns"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI ekrāns"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Pārklājums Nr. <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Ievadiet SIM kartes PIN"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Ievadiet PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Ievadiet paroli"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK kods"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Jauns PIN kods"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM karte ir atspējota. Lai turpinātu, ievadiet PUK kodu. Lai iegūtu detalizētu informāciju, sazinieties ar mobilo sakaru operatoru."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Ievadiet vēlamo PIN kodu."</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Apstipriniet vēlamo PIN."</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Notiek SIM kartes atbloķēšana..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"PIN kods nav pareizs."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Ievadiet PIN, kas sastāv no 4 līdz 8 cipariem."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Ievadiet PUK, kas sastāv no vismaz 8 cipariem."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Ievadiet PUK kodu un jaunu PIN kodu"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Ievadītais PUK nav pareizs."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK kodam ir jābūt vismaz 8 ciparus garam."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Atkārtoti ievadiet pareizo PUK kodu. Ja vairākas reizes ievadīsiet to nepareizi, SIM karte tiks neatgriezeniski atspējota."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN kodi neatbilst."</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Pārāk daudz kombinācijas mēģinājumu"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Lai atbloķētu, pierakstieties, izmantojot savu Google kontu."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Lietotājvārds (e-pasts)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Pierakstīties"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nederīgs lietotājvārds vai parole."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Vai aizmirsāt lietotājvārdu vai paroli?"\n"Apmeklējiet vietni "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Notiek pārbaude..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Notiek SIM kartes atbloķēšana..."</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Jūs nepareizi ievadījāt PIN <xliff:g id="NUMBER_0">%d</xliff:g> reizes."\n\n"Mēģiniet vēlreiz pēc <xliff:g id="NUMBER_1">%d</xliff:g> sekundēm."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Jūs nepareizi ievadījāt paroli <xliff:g id="NUMBER_0">%d</xliff:g> reizes."\n\n"Mēģiniet vēlreiz pēc <xliff:g id="NUMBER_1">%d</xliff:g> sekundēm."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Jūs nepareizi norādījāt atbloķēšanas kombināciju <xliff:g id="NUMBER_0">%d</xliff:g> reizes."\n\n"Mēģiniet vēlreiz pēc <xliff:g id="NUMBER_1">%d</xliff:g> sekundēm."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Jūs nepareizi norādījāt atbloķēšanas kombināciju <xliff:g id="NUMBER_0">%d</xliff:g> reizes. Pēc vēl <xliff:g id="NUMBER_1">%d</xliff:g> neveiksmīgiem mēģinājumiem planšetdators būs jāatbloķē, izmantojot e-pasta kontu."\n\n"Mēģiniet vēlreiz pēc <xliff:g id="NUMBER_2">%d</xliff:g> sekundēm."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Jūs nepareizi norādījāt atbloķēšanas kombināciju <xliff:g id="NUMBER_0">%d</xliff:g> reizes. Pēc vēl <xliff:g id="NUMBER_1">%d</xliff:g> neveiksmīgiem mēģinājumiem tālrunis būs jāatbloķē, izmantojot e-pasta kontu."\n\n"Mēģiniet vēlreiz pēc <xliff:g id="NUMBER_2">%d</xliff:g> sekundēm."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Vai palielināt skaļumu virs drošības līmeņa?"\n"Ilgstoši klausoties skaņu lielā skaļumā, var tikt bojāta dzirde."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Pieejamības režīms ir iespējots."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index cf9ceb6fb99e..8bd9a46c6b31 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Membenarkan apl untuk mendapatkan semula keadaan dalaman sistem. Apl hasad boleh mendapatkan pelbagai maklumat peribadi dan selamat yang biasanya tidak ia perlukan."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"dapatkan semula kandungan skrin"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Membenarkan apl untuk mendapatkan kandungan tetingkap aktif. Apl hasad boleh mengambil keseluruhan kandungan tetingkap dan memeriksa semua teks kecuali kata laluan."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"dayakan kebolehcapaian untuk sementara"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Membenarkan aplikasi untuk mendayakan kebolehcapaian untuk sementara pada peranti. Apl hasad mungkin mendayakan kebolehcapaian tanpa izin pengguna."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"dapatkan maklumat tetingkap"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Membolehkan aplikasi mendapatkan maklumat tentang tetingkap dari pengurus tetingkap. Apl hasad boleh mendapatkan maklumat yang bertujuan untuk penggunaan sistem dalaman."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"tapis acara"</string> @@ -324,7 +322,7 @@ <string name="permlab_internalSystemWindow" msgid="2148563628140193231">"memapaparkan tetingkap yang tiada kebenaran"</string> <string name="permdesc_internalSystemWindow" msgid="7458387759461466397">"Membenarkan apl untuk membuat tetingkap yang dimaksudkan untuk digunakan oleh antara muka pengguna sistem dalaman. Bukan untuk digunakan oleh apl biasa."</string> <string name="permlab_systemAlertWindow" msgid="3543347980839518613">"lukis atas apl lain"</string> - <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"Membenarkan aplikasi bertindih di atas aplikasi lain atau sebahagian daripada antara muka pengguna. Ia mungkin mengganggu penggunaan antara muk anda dalam sebarang aplikasi atau menukar apa yang anda rasa anda lihat dalam aplikasi lain."</string> + <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"Membenarkan aplikasi bertindih di atas aplikasi lain atau sebahagian daripada antara muka pengguna. Ini mungkin mengganggu penggunaan antara muka anda dalam sebarang aplikasi atau menukar apa yang anda rasa anda lihat dalam aplikasi lain."</string> <string name="permlab_setAnimationScale" msgid="2805103241153907174">"mengubah suai kelajuan animasi global"</string> <string name="permdesc_setAnimationScale" msgid="7690063428924343571">"Membenarkan apl menukar kelajuan animasi global (animasi yang lebih laju atau lebih perlahan) pada bila-bila masa sahaja."</string> <string name="permlab_manageAppTokens" msgid="1286505717050121370">"urus token apl"</string> @@ -559,7 +557,7 @@ <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"akses tetapan Bluetooth"</string> <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"Membenarkan apl mengkonfigurasikan tablet Bluetooth setempat dan menemui serta berpasangan dengan peranti jauh."</string> <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"Membenarkan apl mengkonfigurasikan telefon Bluetooth setempat dan menemui serta berpasangan dengan peranti jauh."</string> - <string name="permlab_accessWimaxState" msgid="4195907010610205703">"sambung dan nyahsambung dari WiMAX"</string> + <string name="permlab_accessWimaxState" msgid="4195907010610205703">"sambung dan putuskan sambungan WiMAX"</string> <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Membenarkan apl menentukan sama ada WiMaX didayakan dan maklumat tentang sebarang rangkaian WiMaX yang disambungkan."</string> <string name="permlab_changeWimaxState" msgid="2405042267131496579">"Tukar keadaan WiMAX"</string> <string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"Membenarkan apl untuk menyambungkan tablet ke dan menyahsambungkan tablet dari rangkaian WiMaX."</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Corak dipadamkan"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Sel ditambahkan"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Corak siap"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1094,18 +1100,22 @@ <string name="wifi_p2p_to_message" msgid="248968974522044099">"Kepada:"</string> <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Taipkan PIN yang diperlukan:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> - <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"Telefon akan dinyahsambung buat sementara dari Wi-Fi semasa disambungkan ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> + <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"Sambungan telefon ke Wi-Fi akan diputuskan buat sementara waktu semasa telefon bersambung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> <string name="select_character" msgid="3365550120617701745">"Masukkan aksara"</string> <string name="sms_control_title" msgid="7296612781128917719">"Menghantar mesej SMS"</string> <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> sedang menghantar banyak mesej SMS. Adakah anda mahu membenarkan apl ini terus menghantar mesej?"</string> <string name="sms_control_yes" msgid="3663725993855816807">"Benarkan"</string> <string name="sms_control_no" msgid="625438561395534982">"Nafikan"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ingin menghantar mesej kepada <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Ini akan menyebabkan bayaran dikenakan kepada akaun mudah alih anda."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Ini akan menyebabkan bayaran dikenakan kepada akaun mudah alih anda."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Hantar"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Batal"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Ingat pilihan saya"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Sentiasa Benarkan"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Jangan Benarkan"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Kad SIM dikeluarkan"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Fon kepala"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Pembesar suara dok"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistem"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Audio Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Selesai"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Output media"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Skrin Terbina Dalam"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Skrin HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Tindih #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Masukkan PIN SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Masukkan PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Masukkan Kata Laluan"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Kod PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Kod PIN Baharu"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Membuka kunci kad SIM..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Kod PIN salah."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Taipkan PIN yang mengandungi 4 hingga 8 nombor."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Taipkan PUK yang mempunyai 8 nombor atau lebih panjang."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Taip PUK dan kod PIN baharu"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Kod PUK yang anda taipkan tidak betul."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Terlalu banyak percubaan melukis corak"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Untuk membuka kunci, log masuk dengan akaun Google anda."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nama Pengguna (E-mel)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Log masuk"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nama pengguna atau kata laluan tidak sah."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Lupa nama pengguna atau kata laluan anda?"\n"Lawati"<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Menyemak…"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Anda telah menaip PIN anda secara salah sebanyak <xliff:g id="NUMBER_0">%d</xliff:g> kali. "\n\n"Cuba lagi dalam <xliff:g id="NUMBER_1">%d</xliff:g> saat."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Anda telah menaip kata laluan anda secara salah sebanyak <xliff:g id="NUMBER_0">%d</xliff:g> kali. "\n\n"Cuba lagi dalam <xliff:g id="NUMBER_1">%d</xliff:g> saat."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Anda telah tersilap melukis corak buka kunci anda sebanyak <xliff:g id="NUMBER_0">%d</xliff:g> kali. "\n\n"Cuba lagi dalam <xliff:g id="NUMBER_1">%d</xliff:g> saat."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Anda telah tersilap melukis corak buka kunci sebanyak <xliff:g id="NUMBER_0">%d</xliff:g> kali. Selepas <xliff:g id="NUMBER_1">%d</xliff:g> lagi percubaan yang tidak berjaya, anda akan diminta membuka kunci tablet anda menggunakan log masuk Google anda."\n\n" Cuba lagi dalam <xliff:g id="NUMBER_2">%d</xliff:g> saat."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Anda telah tersilap lukis corak buka kunci sebanyak <xliff:g id="NUMBER_0">%d</xliff:g> kali. Selepas <xliff:g id="NUMBER_1">%d</xliff:g> lagi percubaan yang tidak berjaya, anda akan diminta membuka kunci telefon anda menggunakan log masuk Google anda."\n\n" Cuba lagi dalam <xliff:g id="NUMBER_2">%d</xliff:g> saat."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Tingkatkan kelantangan di atas tahap selamat?"\n"Mendengar pada kelantangan tinggi untuk tempoh yang panjang boleh merosakkan pendengaran anda."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Kebolehcapaian didayakan."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index d913062a5542..b2f9595ffb98 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Lar appen hente ut informasjon om systemets indre tilstand. Ondsinnede apper kan hente et bredt spekter av privat og sikker informasjon som de vanligvis aldri burde ha behov for."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"hent av skjerminnhold"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Lar appen hente ut innholdet i det aktive vinduet. Ondsinnede apper kan hente ut hele vindusinnholdet og undersøke all teksten, med unntak av passord."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"Aktiver tilgjengelighet midlertidig"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Lar en app midlertidig aktivere tilgjengelighet på enheten. Skadelige apper kan aktivere tilgjengelighet uten bekreftelse fra brukeren."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"hente vindusinformasjon"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Lar appen hente informasjon om vinduene fra vindusbehandleren. Skadelige apper kan hente informasjon som ikke er ment for intern systembruk."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrere hendelser"</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Mønsteret er slettet"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Celle er lagt til"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Mønsteret er fullført"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Modul %2$d av %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Brukervelgeren"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Status"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Mediekontroll"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1103,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Tillat"</string> <string name="sms_control_no" msgid="625438561395534982">"Sperr"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ønsker å sende en melding til <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Dette kan medføre belastninger på mobilkontoen din."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Dette medfører kostnader på mobilkontoen din."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Send"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Avbryt"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Husk valget mitt"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Alltid tillat"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Aldri tillat"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kort er fjernet"</string> @@ -1365,11 +1371,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Hodetelefoner"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dokkhøyttalere"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-lyd"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-lyd"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Fullført"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Medieutgang"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Innebygd skjerm"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI-skjerm"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Overlegg #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1399,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Skriv inn PIN-koden for SIM-kortet"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Skriv inn PIN-koden"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Skriv inn passordet"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK-kode"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Ny PIN-kode"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Låser opp SIM-kortet ..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Feil PIN-kode."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Skriv inn en PIN-kode på fire til åtte sifre."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Skriv inn en PUK-kode på åtte sifre eller mer."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Skriv inn PUK-koden og en ny PIN-kode"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"PUK-koden du har skrevet inn er ikke riktig."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"For mange forsøk på tegning av mønster"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Logg deg på med Google-kontoen din for å låse opp."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Brukernavn (e-postadresse)"</string> @@ -1399,7 +1421,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Logg på"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Ugyldig brukernavn eller passord."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Har du glemt brukernavnet eller passordet?"\n"Gå til "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Kontrollerer …"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Du har oppgitt feil PIN-kode <xliff:g id="NUMBER_0">%d</xliff:g> ganger. "\n\n"Prøv på nytt om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Du har tastet inn passordet ditt feil <xliff:g id="NUMBER_0">%d</xliff:g> ganger. "\n\n"Prøv på nytt om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Du har tegnet opplåsningsmønsteret ditt feil <xliff:g id="NUMBER_0">%d</xliff:g> ganger. "\n\n"Prøv på nytt om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> @@ -1410,12 +1433,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Du har tegnet opplåsningsmønsteret feil <xliff:g id="NUMBER_0">%d</xliff:g> ganger. Etter ytterligere <xliff:g id="NUMBER_1">%d</xliff:g> gale forsøk, blir du bedt om å låse opp nettbrettet via en e-postkonto."\n\n" Prøv på nytt om <xliff:g id="NUMBER_2">%d</xliff:g> sekunder."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Du har tegnet opplåsningsmønsteret feil <xliff:g id="NUMBER_0">%d</xliff:g> ganger. Etter ytterligere <xliff:g id="NUMBER_1">%d</xliff:g> gale forsøk, blir du bedt om å låse opp telefonen via en e-postkonto."\n\n" Prøv på nytt om <xliff:g id="NUMBER_2">%d</xliff:g> sekunder."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Vil du øke lydnivået over trygt nivå?"\n"Lytting på høyt lydnivå i lange perioder kan skade hørselen din."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"Fortsett å holde nede to fingre for å aktivere tilgjengelighetstjenesten."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"Tilgjengelighet er aktivert."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Tilgjengelighetstjenesten ble avbrutt."</string> + <string name="user_switched" msgid="3768006783166984410">"Gjeldene bruker: <xliff:g id="NAME">%1$s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 7ad60f16e649..86ab327f05c7 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Hiermee kan de app de interne systeemstatus ophalen. Schadelijke apps kunnen een grote hoeveelheid persoonlijke en beveiligde informatie ophalen die ze normaal gesproken nooit nodig hebben."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"scherminhoud ophalen"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Hiermee kan de app de inhoud van het actieve venster ophalen. Schadelijke apps kunnen de volledige inhoud van het venster ophalen en alle tekst bekijken, behalve wachtwoorden."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"toegankelijkheid tijdelijk inschakelen"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Een app toestaan toegankelijkheid tijdelijk in te schakelen op het apparaat. Schadelijke apps kunnen toegankelijkheid inschakelen zonder toestemming van de gebruiker."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"venstergegevens ophalen"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Toestaan dat een app gegevens over vensters kan ophalen uit vensterbeheer. Schadelijke apps kunnen gegevens ophalen die zijn bedoeld voor interne systeemfunctionaliteit."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"evenementen filteren"</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Patroon gewist"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Cel toegevoegd"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Patroon voltooid"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Widget %2$d van %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Gebruikersselectie"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Status"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Mediabediening"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"Alt"</string> @@ -1101,11 +1103,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Toestaan"</string> <string name="sms_control_no" msgid="625438561395534982">"Weigeren"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> wil graag een bericht verzenden naar <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Er kunnen kosten in rekening worden gebracht op uw mobiele account."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Er worden kosten in rekening gebracht op uw mobiele account."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Dit "<font fgcolor="#ffffb060">"kan leiden tot kosten"</font>" in uw mobiele account."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Dit leidt tot kosten in uw mobiele account."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Verzenden"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Annuleren"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Mijn keuze onthouden"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"U kunt dit later wijzigen in \'Instellingen\' > \'Apps\'"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Altijd toestaan"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Nooit toestaan"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Simkaart verwijderd"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefoon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Hoofdtelefoon"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dockluidsprekers"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-audio"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Systeem"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-audio"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Gereed"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Media-uitvoer"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Scannen..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Verbinden..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Beschikbaar"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Niet beschikbaar"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Ingebouwd scherm"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI-scherm"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Overlay <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Geef de pincode van de simkaart op"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Pincode opgeven"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Wachtwoord invoeren"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK-code"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Nieuwe pincode"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"De simkaart is nu uitgeschakeld. Geef de PUK-code op om door te gaan. Neem contact op met de provider voor informatie."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Gewenste pincode opgeven"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Gewenste pincode bevestigen"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Simkaart ontgrendelen..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Onjuiste pincode."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Voer een pincode van 4 tot 8 cijfers in."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Typ een PUK-code die 8 cijfers of langer is."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Geef de PUK-code en de nieuwe pincode op"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"De PUK-code die u heeft ingevoerd, is onjuist."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"De PUK-code is minimaal acht nummers lang."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Geef de juiste PUK-code opnieuw op. Bij herhaalde pogingen wordt de simkaart permanent uitgeschakeld."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Pincodes komen niet overeen"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Te veel patroonpogingen"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Als u wilt ontgrendelen, moet u zich aanmelden bij uw Google-account."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Gebruikersnaam (e-mail)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Aanmelden"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Ongeldige gebruikersnaam of wachtwoord."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Bent u uw gebruikersnaam of wachtwoord vergeten?"\n"Ga naar "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Controleren…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Simkaart ontgrendelen…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"U heeft uw pincode <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getypt. "\n\n"Probeer het over <xliff:g id="NUMBER_1">%d</xliff:g> seconden opnieuw."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"U heeft uw wachtwoord <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getypt. "\n\n"Probeer het over <xliff:g id="NUMBER_1">%d</xliff:g> seconden opnieuw."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"U heeft uw ontgrendelingspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. "\n\n"Probeer het over <xliff:g id="NUMBER_1">%d</xliff:g> seconden opnieuw."</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"U heeft uw ontgrendelingspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. Na nog eens <xliff:g id="NUMBER_1">%d</xliff:g> mislukte pogingen wordt u gevraagd uw tablet te ontgrendelen via een e-mailaccount."\n\n" Probeer het over <xliff:g id="NUMBER_2">%d</xliff:g> seconden opnieuw."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"U heeft uw ontgrendelingspatroon <xliff:g id="NUMBER_0">%d</xliff:g> keer onjuist getekend. Na nog eens <xliff:g id="NUMBER_1">%d</xliff:g> mislukte pogingen wordt u gevraagd uw telefoon te ontgrendelen via een e-mailaccount."\n\n" Probeer het over <xliff:g id="NUMBER_2">%d</xliff:g> seconden opnieuw."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Wilt u het volume verhogen tot boven het aanbevolen geluidsniveau?"\n"Te lang luisteren op een te hoog volume kan leiden tot gehoorbeschadiging."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"Houd het scherm met twee vingers aanraken om toegankelijkheid in te schakelen."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"Toegankelijkheid ingeschakeld."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Toegankelijkheid geannuleerd."</string> + <string name="user_switched" msgid="3768006783166984410">"Huidige gebruiker <xliff:g id="NAME">%1$s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 19d42abc0107..c38e44e43b4f 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Pozwala aplikacji na pobieranie wewnętrznego stanu systemu. Złośliwe aplikacje mogą pobrać szereg prywatnych i zabezpieczonych informacji, które normalnie nie są im potrzebne."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"pobieranie zawartości ekranu"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Pozwala aplikacji na pobieranie zawartości aktywnego okna. Złośliwe aplikacje mogą pobrać całą zawartość okna i przeanalizować znajdujący się w nim tekst z wyjątkiem haseł."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"tymczasowo włącz ułatwienia dostępu"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Umożliwia aplikacji tymczasowe włączanie ułatwień dostępu na urządzeniu. Złośliwe aplikacje mogą je włączać bez zgody użytkownika."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"pobieranie informacji o oknach"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Zezwala aplikacji na pobieranie informacji o oknach z menedżera okien. Złośliwe aplikacje mogą pobierać informacje przeznaczone do użytku wewnętrznego w systemie."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrowanie zdarzeń"</string> @@ -762,7 +760,7 @@ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Poprawnie!"</string> <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Spróbuj ponownie."</string> <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Spróbuj ponownie."</string> - <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Przekroczono maksymalną liczbę prób odblokowania Face Unlock."</string> + <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Przekroczono maksymalną liczbę prób rozpoznania twarzy."</string> <string name="lockscreen_plugged_in" msgid="8057762828355572315">"Ładowanie (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="lockscreen_charged" msgid="4938930459620989972">"Naładowany."</string> <string name="lockscreen_battery_short" msgid="4477264849386850266">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> @@ -813,6 +811,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Wzór wyczyszczony"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Dodano komórkę."</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Wzór ukończony"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1102,11 +1108,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Pozwól"</string> <string name="sms_control_no" msgid="625438561395534982">"Odmów"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> chce wysłać wiadomość do <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Może to spowodować naliczenie opłat na koncie telefonu komórkowego."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Spowoduje to naliczenie opłat na koncie telefonu komórkowego."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"To "<font fgcolor="#ffffb060">"może spowodować obciążenie"</font>" Twojego konta komórkowego."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"To spowoduje obciążenie Twojego konta komórkowego."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Wyślij"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Anuluj"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Zapamiętaj mój wybór"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Możesz to zmienić: Ustawienia > Aplikacje"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Zawsze zezwalaj"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Nigdy nie zezwalaj"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Karta SIM wyjęta"</string> @@ -1366,11 +1373,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Słuchawki"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Głośniki stacji dokującej"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Dźwięk przez HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Dźwięk Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Gotowe"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Wyjście multimediów"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Skanuję..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Nawiązuję połączenie..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Dostępne"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Niedostępne"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Wbudowany ekran"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Ekran HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Nakładka nr <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1385,14 +1396,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Podaj PIN karty SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Podaj PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Wpisz hasło"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Nowy PIN"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Karta SIM została wyłączona. Podaj kod PUK, by przejść dalej. Szczegóły uzyskasz od operatora."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Podaj wybrany kod PIN"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Potwierdź wybrany kod PIN"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Odblokowuję kartę SIM…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Nieprawidłowy PIN."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Wpisz PIN o długości od 4 do 8 cyfr."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Wpisz PUK składający się z co najmniej 8 cyfr."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Wpisz PUK i nowy PIN"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Podany PUK jest nieprawidłowy."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Kod PUK musi mieć co najmniej 8 cyfr."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Ponownie podaj poprawny kod PUK. Nieudane próby spowodują trwałe wyłączenie karty SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Kody PIN nie pasują"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Zbyt wiele prób narysowania wzoru"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Aby odblokować, zaloguj się na konto Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nazwa użytkownika (e-mail)"</string> @@ -1400,7 +1412,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Zaloguj się"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nieprawidłowa nazwa użytkownika lub hasło."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Nie pamiętasz nazwy użytkownika lub hasła?"\n"Wejdź na "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Sprawdzam…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Odblokowuję kartę SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Po raz <xliff:g id="NUMBER_0">%d</xliff:g> wpisałeś nieprawidłowy PIN. "\n\n"Spróbuj ponownie za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Po raz <xliff:g id="NUMBER_0">%d</xliff:g> wpisałeś nieprawidłowe hasło. "\n\n"Spróbuj ponownie za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Po raz <xliff:g id="NUMBER_0">%d</xliff:g> narysowałeś nieprawidłowy wzór odblokowania. "\n\n"Spróbuj ponownie za <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> @@ -1411,12 +1423,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Po raz <xliff:g id="NUMBER_0">%d</xliff:g> nieprawidłowo narysowałeś wzór odblokowania. Po kolejnych <xliff:g id="NUMBER_1">%d</xliff:g> nieudanych próbach konieczne będzie odblokowanie tabletu przy użyciu danych logowania na konto Google."\n\n" Spróbuj ponownie za <xliff:g id="NUMBER_2">%d</xliff:g> s."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Po raz <xliff:g id="NUMBER_0">%d</xliff:g> nieprawidłowo narysowałeś wzór odblokowania. Po kolejnych <xliff:g id="NUMBER_1">%d</xliff:g> nieudanych próbach konieczne będzie odblokowanie telefonu przy użyciu danych logowania na konto Google."\n\n" Spróbuj ponownie za <xliff:g id="NUMBER_2">%d</xliff:g> s."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Chcesz ustawić głośność powyżej bezpiecznego poziomu?"\n"Słuchanie przy dużym poziomie głośności przez dłuższy czas może doprowadzić do uszkodzenia słuchu."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Włączono ułatwienia dostępu."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index afbcd42401f5..fc6d17a14027 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -156,7 +156,7 @@ <string name="global_action_power_off" msgid="4471879440839879722">"Desligar"</string> <string name="global_action_bug_report" msgid="7934010578922304799">"Relatório de erros"</string> <string name="bugreport_title" msgid="2667494803742548533">"Criar um relatório de erros"</string> - <string name="bugreport_message" msgid="398447048750350456">"Isto irá recolher informações sobre o estado atual do seu dispositivo para enviar através de uma mensagem de email. Demorará um pouco desde o início do relatório de erro até que este se encontre pronto para ser enviado. Aguarde um pouco."</string> + <string name="bugreport_message" msgid="398447048750350456">"Será recolhida informação sobre o estado atual do seu dispositivo a enviar através de uma mensagem de email. Demorará algum tempo até que o relatório de erro esteja pronto para ser enviado. Aguarde um pouco."</string> <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Modo silencioso"</string> <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Som desactivado"</string> <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"O som está activado"</string> @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Permite que a aplicação obtenha o estado interno do sistema. As aplicações maliciosas podem obter uma ampla variedade de dados privados e seguros de que, normalmente, nunca devem necessitar."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"obter o conteúdo do ecrã"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Permite que a aplicação obtenha o conteúdo da janela ativa. As aplicações maliciosas podem obter todo o conteúdo da janela e examinar todo o texto, exceto as palavras-passe."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"acessibilidade ativada temporariamente"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Permite que uma aplicação ative temporariamente a acessibilidade no dispositivo. As aplicações maliciosas podem ativar a acessibilidade sem o consentimento do utilizador."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"obter informações da janela"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Permite que uma aplicação obtenha informações sobre as janelas a partir do gestor de janelas. Aplicações maliciosas podem obter informações que se destinam à utilização interna do sistema."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrar eventos"</string> @@ -626,7 +624,7 @@ <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Def. encriptação armazenamento"</string> <string name="policydesc_encryptedStorage" msgid="2637732115325316992">"Solicitar encriptação dos dados da aplicação armazenados."</string> <string name="policylab_disableCamera" msgid="6395301023152297826">"Desativar câmaras"</string> - <string name="policydesc_disableCamera" msgid="2306349042834754597">"Evitar a utilização de todas as câmaras do aparelho."</string> + <string name="policydesc_disableCamera" msgid="2306349042834754597">"Evitar a utilização de todas as câmaras do dispositivo."</string> <string name="policylab_disableKeyguardFeatures" msgid="266329104542638802">"Desat. func. com teclado bloq."</string> <string name="policydesc_disableKeyguardFeatures" msgid="3467082272186534614">"Evitar a utilização de algumas funcionalidades com o teclado bloqueado."</string> <string-array name="phoneTypes"> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Sequência apagada"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Célula adicionada"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Sequência concluída"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Widget %2$d de %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Seletor de utilizadores"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Estado"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Controlos de multimédia"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1103,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Permitir"</string> <string name="sms_control_no" msgid="625438561395534982">"Recusar"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> gostaria de enviar uma mensagem para <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Isto poderá resultar em encargos na sua conta de telemóvel."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Isto resultará em encargos na sua conta de telemóvel."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Isto "<font fgcolor="#ffffb060">"poderá resultar em custos"</font>" para a sua conta de telemóvel."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Isto resultará em custos para a sua conta de telemóvel."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Enviar"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Cancelar"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Memorizar a minha escolha"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Pode depois alterar isto em Definições > Aplicações"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Permitir Sempre"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Nunca Permitir"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Cartão SIM removido"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telemóvel"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Auscultadores"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altif. estação ancoragem"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Áudio HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Áudio Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Concluído"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Saída de som multimédia"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"A procurar..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"A ligar..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Disponível"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Não disponível"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Ecrã Integrado"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Ecrã HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Sobreposição #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Introduzir PIN do cartão SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Introduzir PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Introduzir Palavra-passe"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Código PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Novo código PIN"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"O SIM está agora desativado. Introduza o código PUK para continuar. Contacte o operador para obter detalhes."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Introduza o código PIN pretendido"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Confirme o código PIN pretendido"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"A desbloquear cartão SIM..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Código PIN incorreto."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Introduza um PIN entre 4 e 8 números."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Introduza um PUK que tenha 8 ou mais algarismos."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Introduzir PUK e o novo código PIN"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"O PUK que introduziu não está correto."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"O código PUK deve ter 8 ou mais números."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Volte a introduzir o código PUK correto. Demasiadas tentativas consecutivas irão desativar permanentemente o SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Os códigos PIN não correspondem"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Demasiadas tentativas para desenhar sequência"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Para desbloquear, inicie sessão com a sua Conta do Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nome de utilizador (email)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Iniciar sessão"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nome de utilizador ou palavra-passe inválidos."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Esqueceu-se do nome de utilizador ou da palavra-passe?"\n"Aceda a "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"A verificar…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"A desbloquear SIM..."</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Escreveu o PIN incorretamente <xliff:g id="NUMBER_0">%d</xliff:g> vezes. "\n\n"Tente novamente dentro de <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Escreveu a palavra-passe incorretamente <xliff:g id="NUMBER_0">%d</xliff:g> vezes. "\n\n"Tente novamente dentro de <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Desenhou a sua sequência de desbloqueio incorretamente <xliff:g id="NUMBER_0">%d</xliff:g> vezes. "\n\n"Tente novamente dentro de <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Desenhou a sequência de desbloqueio incorretamente <xliff:g id="NUMBER_0">%d</xliff:g> vezes. Depois de mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas sem sucesso, ser-lhe-á pedido para desbloquear o tablet através de uma conta de email."\n\n" Tente novamente dentro de <xliff:g id="NUMBER_2">%d</xliff:g> segundos."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Desenhou a sequência de desbloqueio incorretamente <xliff:g id="NUMBER_0">%d</xliff:g> vezes. Depois de mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas sem sucesso, ser-lhe-á pedido para desbloquear o telemóvel através de uma conta de email."\n\n" Tente novamente dentro de <xliff:g id="NUMBER_2">%d</xliff:g> segundos."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Aumentar o volume acima do nível de segurança?"\n"Ouvir em volume alto durante longos períodos de tempo poderá prejudicar a sua audição."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"Mantenha os dois dedos para ativar a acessibilidade."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"Acessibilidade ativada."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Acessibilidade cancelada."</string> + <string name="user_switched" msgid="3768006783166984410">"<xliff:g id="NAME">%1$s</xliff:g> do utilizador atual."</string> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index cbf2dfee77ac..d0d4118ae2c7 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Permite que o aplicativo recupere o estado interno do sistema. Aplicativos maliciosos podem obter uma grande variedade de informações privadas e seguras que eles normalmente não precisariam."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"recuperar conteúdo da tela"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Permite que o aplicativo recupere o conteúdo da janela ativa. Aplicativos maliciosos podem recuperar o conteúdo da janela inteira e examinar todo o texto, exceto as senhas."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"ativar temporariamente a acessibilidade"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Permite que um aplicativo ative temporariamente a acessibilidade no dispositivo. Aplicativos maliciosos podem ativar a acessibilidade sem o consentimento do usuário."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"recuperar informações de janelas"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Permite que o aplicativo recupere informações sobre as janelas do gerenciador de janelas. Aplicativos mal-intencionados podem recuperar informações destinadas ao uso interno do sistema."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrar eventos"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Padrão apagado"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Célula adicionada"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Padrão concluído"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Permitir"</string> <string name="sms_control_no" msgid="625438561395534982">"Negar"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> deseja enviar uma mensagem para <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Isto pode gerar cobranças em sua conta de celular."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Isto poderá gerar cobranças em sua conta de celular."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Enviar"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Cancelar"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Lembrar minha escolha"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Sempre permitir"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Nunca permitir"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Cartão SIM removido"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefone"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Fones de ouvido"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Alto-falantes do dock"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Áudio HDMI"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Áudio Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Concluído"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Saída de mídia"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Tela integrada"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Tela HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Sobreposição nº <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Digite o PIN do cartão SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Digite o PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Digite a senha"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Código PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Novo código PIN"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Desbloqueando o cartão SIM…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Código PIN incorreto."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Digite um PIN com quatro a oito números."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Digite um PUK com oito números ou mais."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Insira o PUK e o novo código PIN"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"O PUK digitado está incorreto."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Muitas tentativas de padrão"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Para desbloquear, faça login usando sua Conta do Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nome de usuário (e-mail)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Fazer login"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nome de usuário ou senha inválidos."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Esqueceu seu nome de usuário ou senha?"\n"Acesse "<b>"google.com.br/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Verificando..."</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Você digitou seu PIN incorretamente <xliff:g id="NUMBER_0">%d</xliff:g> vezes. "\n\n"Tente novamente em <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Você digitou sua senha incorretamente <xliff:g id="NUMBER_0">%d</xliff:g> vezes. "\n\n"Tente novamente em <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Você desenhou sua sequência de desbloqueio incorretamente <xliff:g id="NUMBER_0">%d</xliff:g> vezes. "\n\n"Tente novamente em <xliff:g id="NUMBER_1">%d</xliff:g> segundos."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Você desenhou sua sequência de desbloqueio incorretamente <xliff:g id="NUMBER_0">%d</xliff:g> vezes. Se fizer mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas incorretas, será solicitado que você use o login do Google para desbloquear seu tablet."\n\n" Tente novamente em <xliff:g id="NUMBER_2">%d</xliff:g> segundos."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Você desenhou sua sequência de desbloqueio incorretamente <xliff:g id="NUMBER_0">%d</xliff:g> vezes. Se fizer mais <xliff:g id="NUMBER_1">%d</xliff:g> tentativas incorretas, será solicitado que você use o login do Google para desbloquear."\n\n" Tente novamente em <xliff:g id="NUMBER_2">%d</xliff:g> segundos."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Aumentar o volume acima do nível seguro?"\n"A audição em volume elevado por períodos longos pode prejudicar sua audição."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Acessibilidade ativada."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index 1241346a4b06..c783c61eebe1 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -1297,6 +1297,14 @@ <skip /> <!-- no translation found for lockscreen_access_pattern_detected (4988730895554057058) --> <skip /> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1711,9 +1719,9 @@ <skip /> <!-- no translation found for sms_short_code_confirm_message (1645436466285310855) --> <skip /> - <!-- no translation found for sms_short_code_details (4992814738863678373) --> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> <skip /> - <!-- no translation found for sms_premium_short_code_details (4291752905667807485) --> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> <skip /> <!-- no translation found for sms_short_code_confirm_allow (4458878637111023413) --> <skip /> @@ -1721,6 +1729,8 @@ <skip /> <!-- no translation found for sms_short_code_remember_choice (5289538592272218136) --> <skip /> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <!-- no translation found for sms_short_code_confirm_always_allow (3241181154869493368) --> <skip /> <!-- no translation found for sms_short_code_confirm_never_allow (446992765774269673) --> @@ -2180,7 +2190,7 @@ <skip /> <!-- no translation found for default_audio_route_name_dock_speakers (6240602982276591864) --> <skip /> - <!-- no translation found for default_audio_route_name_hdmi (7986404173839007682) --> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> <skip /> <!-- no translation found for default_audio_route_category_name (3722811174003886946) --> <skip /> @@ -2190,6 +2200,14 @@ <skip /> <!-- no translation found for media_route_button_content_description (5758553567065145276) --> <skip /> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <!-- no translation found for display_manager_built_in_display_name (2583134294292563941) --> <skip /> <!-- no translation found for display_manager_hdmi_display_name (1555264559227470109) --> @@ -2218,9 +2236,11 @@ <skip /> <!-- no translation found for kg_password_instructions (5753646556186936819) --> <skip /> - <!-- no translation found for kg_puk_enter_puk_hint (5183097160254244459) --> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> <skip /> - <!-- no translation found for kg_puk_enter_pin_hint (597821135578014901) --> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> <skip /> <!-- no translation found for kg_sim_unlock_progress_dialog_message (8950398016976865762) --> <skip /> @@ -2228,11 +2248,11 @@ <skip /> <!-- no translation found for kg_invalid_sim_pin_hint (8795159358110620001) --> <skip /> - <!-- no translation found for kg_invalid_sim_puk_hint (5216603185442368307) --> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> <skip /> - <!-- no translation found for kg_sim_puk_recovery_hint (5577753137718442566) --> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> <skip /> - <!-- no translation found for kg_invalid_puk (5809955359950817326) --> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> <skip /> <!-- no translation found for kg_login_too_many_attempts (6486842094005698475) --> <skip /> @@ -2248,7 +2268,7 @@ <skip /> <!-- no translation found for kg_login_account_recovery_hint (5690709132841752974) --> <skip /> - <!-- no translation found for kg_login_checking_password (8849589033659332457) --> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> <skip /> <!-- no translation found for kg_too_many_failed_pin_attempts_dialog_message (8276745642049502550) --> <skip /> @@ -2270,12 +2290,12 @@ <skip /> <!-- no translation found for safe_media_volume_warning (7382971871993371648) --> <skip /> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> <!-- no translation found for accessibility_enabled (1381972048564547685) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index b5d4e596af9f..34128afabe3a 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Permite aplicaţiei să preia starea internă a sistemului. Aplicaţiile rău intenţionate pot să preia o gamă variată de informaţii private şi securizate, de care în mod normal nu ar avea nevoie niciodată."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"preia conţinutul de pe ecran"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Permite aplicaţiei să preia conţinutul ferestrei active. Aplicaţiile rău intenţionate pot să preia întregul conţinut al ferestrei şi să examineze integral textul acesteia, cu excepţia parolelor."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"activare temporară a accesibilității"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Permite unei aplicaţii să activeze temporar accesibilitatea pe gadget. Aplicaţiile rău intenţionate o pot activa fără consimţământul utilizatorului."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"preluare informaţii despre ferestre"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Permite unei aplicaţii să preia informaţii despre ferestrele din managerul de ferestre. Aplicaţiile rău intenţionate pot prelua informaţii care sunt destinate utilizării sistemului intern."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrare evenimente"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Modelul a fost şters"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Celulă adăugată"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Modelul a fost desenat"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Permiteţi"</string> <string name="sms_control_no" msgid="625438561395534982">"Refuzaţi"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> intenţionează să trimită un mesaj la <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Aceasta poate genera costuri în contul dvs. mobil."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Aceasta va genera costuri în contul dvs. mobil."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <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> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <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> <string name="sim_removed_title" msgid="6227712319223226185">"Card SIM eliminat"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Căşti"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Difuz. dispozit. andocare"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Ieşire audio HDMI"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistem"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Audio Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Terminat"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Rezultate media"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Ecran încorporat"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Ecran HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Suprapunerea <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Introduceţi codul PIN al cardului SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Introduceţi codul PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Introduceţi parola"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Codul PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Noul cod PIN"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Se deblochează cardul SIM..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Cod PIN incorect."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Introduceţi un cod PIN format din 4 până la 8 cifre."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Introduceţi un cod PUK format din 8 cifre sau mai mult."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Introduceţi codul PUK şi noul cod PIN"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Codul PUK introdus nu este corect."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Prea multe încercări de desenare a modelului"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Pentru a debloca, conectaţi-vă cu Contul dvs. Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Nume de utilizator (e-mail)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Conectaţi-vă"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Nume de utilizator sau parolă nevalide."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Aţi uitat numele de utilizator sau parola?"\n"Accesaţi "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Se verifică..."</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Aţi introdus incorect codul PIN de <xliff:g id="NUMBER_0">%d</xliff:g> ori."\n\n"Încercaţi din nou peste <xliff:g id="NUMBER_1">%d</xliff:g> (de) secunde."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Aţi introdus incorect parola de <xliff:g id="NUMBER_0">%d</xliff:g> ori. "\n\n"Încercaţi din nou peste <xliff:g id="NUMBER_1">%d</xliff:g> (de) secunde."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%d</xliff:g> ori. "\n\n"Încercaţi din nou peste <xliff:g id="NUMBER_1">%d</xliff:g> (de) secunde."</string> @@ -1410,12 +1437,11 @@ <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">%d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%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">%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">%d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%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">%d</xliff:g> (de) secunde."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Ridicaţi volumul mai sus de nivelul sigur?"\n"Ascultarea la volum ridicat pe perioade lungi de timp vă poate afecta auzul."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"S-a activat accesibilitatea."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 4900df7e8955..6745b66137cf 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Приложение сможет получать данные о внутреннем состоянии системы. Вредоносные программы смогут получать личную и защищенную информацию, к которой у них не должно быть доступа."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"получать доступ к содержанию экрана"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Приложение сможет получать контент активного окна. Вредоносные программы смогут перехватывать такой контент и анализировать любой текст, кроме паролей."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"Включение специальных возможностей"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Приложение сможет временно включать на устройстве специальные возможности. Вредоносные приложения смогут включать их без вашего ведома."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"доступ к информации в окне"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Открывает приложению доступ к информации из диспетчера окон. Обратите внимание, что вредоносное ПО может получить доступ к некоторой системной информации устройства."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"Фильтрация событий"</string> @@ -752,7 +750,7 @@ <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Неверный PIN-код."</string> <string name="keyguard_label_text" msgid="861796461028298424">"Для разблокировки нажмите \"Меню\", а затем 0."</string> <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"Экстренная служба"</string> - <string name="lockscreen_carrier_default" msgid="8963839242565653192">"Сеть не найдена."</string> + <string name="lockscreen_carrier_default" msgid="8963839242565653192">"Сеть не найдена"</string> <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Экран заблокирован."</string> <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Нажмите \"Меню\", чтобы разблокировать экран или вызвать службу экстренной помощи."</string> <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Для разблокировки нажмите \"Меню\"."</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Графический ключ сброшен"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Ячейка добавлена"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Графический ключ введен"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"АБВ"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Разрешить"</string> <string name="sms_control_no" msgid="625438561395534982">"Запретить"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"Приложение <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> собирается отправить сообщение на адрес <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"С вашего мобильного счета будут списаны средства."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"С вашего мобильного счета могут быть списаны средства."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Отправить"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Отмена"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Запомнить выбранный телефон"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Всегда разрешать"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Не разрешать"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-карта удалена"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Телефон"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Наушники"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Динамики док-станции"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-аудио"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Система"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Воспроизведение звука через Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Готово"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Перенаправлять поток мультимедиа"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Встроенный экран"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Экран HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Наложение № <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Введите PIN-код SIM-карты"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Введите PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Введите пароль"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK-код"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Новый PIN-код"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Разблокировка SIM-карты…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Неверный PIN-код."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Введите PIN-код (от 4 до 8 цифр)."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Введите PUK-код из 8 или более цифр."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Введите PUK-код и новый PIN-код"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Введен неверный PUK-код."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Слишком много попыток ввода графического ключа"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Чтобы разблокировать устройство, войдите в свой аккаунт Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Имя пользователя (эл. почта)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Войти"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Неверное имя пользователя или пароль."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Забыли имя пользователя или пароль?"\n"Перейдите на страницу "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Проверка…"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Вы <xliff:g id="NUMBER_0">%d</xliff:g> раз неверно указали PIN-код. "\n\n"Повтор через <xliff:g id="NUMBER_1">%d</xliff:g> сек."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Вы <xliff:g id="NUMBER_0">%d</xliff:g> раз неверно указали пароль."\n\n"Повтор через <xliff:g id="NUMBER_1">%d</xliff:g> сек."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Вы <xliff:g id="NUMBER_0">%d</xliff:g> раз неверно указали графический ключ."\n\n"Повтор через <xliff:g id="NUMBER_1">%d</xliff:g> сек."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Вы <xliff:g id="NUMBER_0">%d</xliff:g> раз неверно указали графический ключ. После <xliff:g id="NUMBER_1">%d</xliff:g> неверных попыток для разблокировки планшетного ПК потребуется войти в аккаунт Google."\n\n"Повтор через <xliff:g id="NUMBER_2">%d</xliff:g> сек."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Вы <xliff:g id="NUMBER_0">%d</xliff:g> раз неверно указали графический ключ. После <xliff:g id="NUMBER_1">%d</xliff:g> неверных попыток для разблокировки телефона потребуется войти в аккаунт Google."\n\n"Повтор через <xliff:g id="NUMBER_2">%d</xliff:g> сек."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Увеличить громкость до небезопасного уровня?"\n"Долговременное прослушивание на такой громкости может повредить слух."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Специальные возможности включены."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index dbe7b9e28432..0cbe0e8a092c 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Umožňuje aplikácii načítať interný stav systému. Škodlivé aplikácie môžu načítať široký rozsah súkromných a zabezpečených informácií, ktoré by obvykle nemali nikdy potrebovať."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"načítanie obsahu obrazovky"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Umožňuje aplikácii načítať obsah aktívneho okna. Škodlivé aplikácie môžu získať celý obsah okna a preskúmať celý jeho text okrem hesiel."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"dočasné povolenie zjednodušenia ovládania"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Umožňuje aplikácii dočasne povoliť zjednodušenie ovládania v zariadení. Škodlivé aplikáciu môžu zjednodušenie ovládania povoliť bez súhlasu používateľa."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"načítanie informácií o oknách"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Umožňuje aplikácii načítať informácie o oknách zo správcu okien. Škodlivé aplikácie môžu načítať informácie, ktoré sú určené pre interné využitie systému."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrovanie udalostí"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Bezpečnostný vzor bol vymazaný"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Bunka bola pridaná"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Bezpečnostný vzor bol dokončený"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Povoliť"</string> <string name="sms_control_no" msgid="625438561395534982">"Odmietnuť"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> chce odoslať správu na adresu <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"To môže spôsobiť, že sa na váš mobilný účet budú účtovať poplatky."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"To spôsobí, že sa na váš mobilný účet budú účtovať poplatky."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Odoslať"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Zrušiť"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Zapamätať si voľbu"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Vždy povoliť"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Nikdy nepovoliť"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Karta SIM bola odobraná"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefón"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Slúchadlá"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Reproduktory doku"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Zvuk HDMI"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Systém"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth audio"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Hotovo"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Výstup médií"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Vstavaná obrazovka"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Obrazovka HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Prekrytie č. <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Zadajte kód PIN karty SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Zadajte kód PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Zadajte heslo"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Kód PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Nový kód PIN"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Prebieha odomykanie karty SIM..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Nesprávny kód PIN."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Zadajte kód PIN s dĺžkou 4 až 8 číslic."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Zadajte kód PUK, ktorý má 8 alebo viac číslic."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Zadajte kód PUK a nový kód PIN"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Zadaný kód PUK nie je správny."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Príliš veľa pokusov o nakreslenie vzoru"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Ak chcete telefón odomknúť, prihláste sa pomocou svojho účtu Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Používateľské meno (e-mail)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Prihlásiť sa"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Neplatné používateľské meno alebo heslo."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Zabudli ste svoje používateľské meno alebo heslo?"\n" Navštívte stránky "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Prebieha kontrola..."</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"<xliff:g id="NUMBER_0">%d</xliff:g>-krát ste zadali nesprávny kód PIN. "\n\n"Skúste to znova o <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"<xliff:g id="NUMBER_0">%d</xliff:g>-krát ste zadali nesprávne heslo. "\n\n"Skúste to znova o <xliff:g id="NUMBER_1">%d</xliff:g>."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"<xliff:g id="NUMBER_0">%d</xliff:g>-krát ste použili nesprávny bezpečnostný vzor. "\n\n"Skúste to znova o <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"<xliff:g id="NUMBER_0">%d</xliff:g>-krát ste nesprávne nakreslili svoj bezpečnostný vzor. Po ďalších <xliff:g id="NUMBER_1">%d</xliff:g> neúspešných pokusoch sa zobrazí výzva na odomknutie tabletu pomocou e-mailového účtu."\n\n" Skúste to znova o <xliff:g id="NUMBER_2">%d</xliff:g> s."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"<xliff:g id="NUMBER_0">%d</xliff:g>-krát ste nesprávne nakreslili svoj bezpečnostný vzor. Po <xliff:g id="NUMBER_1">%d</xliff:g> ďalších neúspešných pokusoch sa zobrazí výzva na odomknutie telefónu pomocou e-mailového účtu."\n\n" Skúste to znova o <xliff:g id="NUMBER_2">%d</xliff:g> s."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Chcete zvýšiť hlasitosť nad bezpečnú úroveň?"\n"Dlhodobé počúvanie pri vysokej hlasitosti môže viesť k poškodeniu vášho sluchu."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Zjednodušenie ovládania je povolené."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 48e74e696568..30473bfaf82a 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Programu omogoča prejemanje notranjega stanja sistema. Zlonamerni programi lahko na ta način dobijo različne zasebne in varnostne podatke, ki jih običajno ne potrebujejo."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"prenos vsebine zaslona"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Programu omogoča dostop do vsebine aktivnega okna. Zlonamerni programi lahko dobijo vso vsebino okna in pregledajo njeno besedilo razen gesel."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"začasno omogoči pripomočke za ljudi s posebnimi potrebami"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Aplikaciji omogoča, da v napravi začasno omogoči pripomočke za ljudi s posebnimi potrebami. Zlonamerne aplikacije jih lahko omogočijo brez soglasja uporabnika."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"prenos podatkov o oknih"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Omogoča, da aplikacija iz upravitelja oken pridobiva podatke o oknih. Zlonamerne aplikacije lahko pridobivajo podatke, namenjene za notranjo uporabo v sistemu."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtriranje dogodkov"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Vzorec je izbrisan"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Celica je dodana"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Vzorec je končan"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Dovoli"</string> <string name="sms_control_no" msgid="625438561395534982">"Zavrni"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> želi poslati sporočilo na <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"To lahko povzroči stroške v vašem mobilnem računu."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"To povzroči stroške v vašem mobilnem računu."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"S tem bo "<font fgcolor="#ffffb060">"morda bremenjen"</font>" vaš račun za mobilno napravo."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"S tem bo bremenjen vaš račun za mobilno napravo."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Pošlji"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Prekliči"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Zapomni si mojo izbiro"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"To lahko pozneje spremenite v Nastavitve > Aplikacije"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Vedno dovoli"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Nikoli ne dovoli"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Kartica SIM odstranjena"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Slušalke"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Zvočniki stojala"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Zvok HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistem"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Zvok prek Bluetootha"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Končano"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Izhod predstavnosti"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Pregledovanje ..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Vzpostavljanje povezave ..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Na voljo"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Ni na voljo"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Vgrajen zaslon"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Zaslon HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Prekrivanje #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Vnesite PIN za kartico SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Vnesite PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Vnesite geslo"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Koda PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Nova koda PIN"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Kartica SIM je onemogočena. Če želite nadaljevati, vnesite kodo PUK. Za dodatne informacije se obrnite na operaterja."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Vnesite želeno kodo PIN"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Potrdite želeno kodo PIN"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Odklepanje kartice SIM ..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Napačna koda PIN."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Vnesite PIN, ki vsebuje od štiri do osem številk."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Vnesite 8- ali več mestni PUK."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Vnesite kodo PUK in novo kodo PIN"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Vneseni PUK ni pravilen."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Koda PUK mora vsebovati 8 ali več števk."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Vnovič vnesite pravilno kodo PUK. Večkratni poskusi bodo trajno onemogočili kartico SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Kodi PIN se ne ujemata"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Preveč poskusov vzorca"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Če želite odkleniti napravo, se prijavite z Google Računom."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Uporabniško ime (e-pošta)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Prijava"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Neveljavno uporabniško ime ali geslo."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Ali ste pozabili uporabniško ime ali geslo?"\n"Obiščite "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Preverjanje ..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Odklepanje kartice SIM …"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"PIN ste <xliff:g id="NUMBER_0">%d</xliff:g>-krat vnesli napačno. "\n\n"Znova poskusite čez <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Geslo ste <xliff:g id="NUMBER_0">%d</xliff:g>-krat vnesli napačno. "\n\n"Znova poskusite čez <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Vzorec za odklepanje ste nepravilno narisali <xliff:g id="NUMBER_0">%d</xliff:g>-krat. "\n\n"Poskusite znova čez <xliff:g id="NUMBER_1">%d</xliff:g> s."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Vzorec za odklepanje ste <xliff:g id="NUMBER_0">%d</xliff:g>-krat napačno vnesli. Po nadaljnjih <xliff:g id="NUMBER_1">%d</xliff:g> neuspešnih poskusih boste pozvani, da tablični računalnik odklenete z e-poštnim računom."\n\n"Poskusite znova čez <xliff:g id="NUMBER_2">%d</xliff:g> s."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Vzorec za odklepanje ste <xliff:g id="NUMBER_0">%d</xliff:g>-krat napačno vnesli. Po nadaljnjih <xliff:g id="NUMBER_1">%d</xliff:g> neuspešnih poskusih boste pozvani, da odklenete telefon z Googlovimi podatki za prijavo."\n\n"Poskusite znova čez <xliff:g id="NUMBER_2">%d</xliff:g> s."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Želite povečati glasnost nad varno raven?"\n"Dolgotrajna izpostavljenost glasnim tonom lahko poškoduje sluh."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Pripomočki za ljudi s posebnimi potrebami so omogočeni."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 669d3344dfa6..594c41bc6369 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Дозвољава апликацији да преузме интерни статус система. Злонамерне апликације могу да преузимају разноврсне приватне и заштићене информације које им обично нису потребне."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"преузимање садржаја екрана"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Дозвољава апликацији да преузме садржај активног прозора. Злонамерне апликације могу да преузму цео садржај прозора и прегледају целокупан текст, осим лозинки."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"привремено омогућавање приступачности"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Дозвољава апликацији да привремено омогући приступачност на уређају. Злонамерне апликације могу да омогуће приступачност без дозволе корисника."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"преузимање информација о прозорима"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Омогућава апликацији да преузме информације о прозорима од менаџера прозора. Злонамерне апликације могу да преузму информације које су намењене за интерну употребу система."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"филтрирање догађаја"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Образац је обрисан"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Ћелија је додата"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Образац је довршен"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Дозволи"</string> <string name="sms_control_no" msgid="625438561395534982">"Одбиј"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> жели да пошаље поруку на адресу <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"То може да изазове додатне трошкове на налогу за мобилни уређај."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"То ће изазвати додатне трошкове на налогу за мобилни уређај."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Ово "<font fgcolor="#ffffb060">"може да изазове трошкове"</font>" на налогу за мобилни уређај."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Ово ће изазвати трошкове на налогу за мобилни уређај."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Пошаљи"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Откажи"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Запамти мој избор"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Ово можете да промените касније у Подешавања > Апликације"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Увек дозволи"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Никада не дозволи"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM картица је уклоњена"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Телефон"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Слушалице"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Звучници базне станице"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI аудио"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Систем"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth аудио"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Готово"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Излаз медија"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Скенирање..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Повезивање..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Доступна"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Нису доступне"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Уграђени екран"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI екран"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Постављени елемент бр. <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Унесите PIN SIM картице"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Унесите PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Унесите лозинку"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK кôд"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Нови PIN кôд"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM картица је сада онемогућена. Унесите PUK кôд да бисте наставили. За детаље контактирајте оператера."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Унесите жељени PIN кôд"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Потврдите жељени PIN кôд"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Откључавање SIM картице…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"PIN кôд је нетачан."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Унесите PIN који има од 4 до 8 бројева."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Унесите PUK који се састоји од 8 бројева или више."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Унесите PUK и нови PIN кôд"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"PUK који сте унели није тачан."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK кôд треба да има 8 или више бројева."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Поново унесите исправни PUK кôд. Поновљени покушаји ће трајно онемогућити SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN кодови се не подударају"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Превише покушаја уноса шаблона"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Да бисте откључали, пријавите се помоћу Google налога."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Корисничко име (адреса е-поште)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Пријави ме"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Неважеће корисничко име или лозинка."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Заборавили сте корисничко име или лозинку?"\n"Посетите адресу "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Проверавање..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Откључавање SIM картице…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Унели сте PIN неисправно <xliff:g id="NUMBER_0">%d</xliff:g> пута. "\n\n"Покушајте поново за <xliff:g id="NUMBER_1">%d</xliff:g> секунде(и)."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Унели сте лозинку неисправно <xliff:g id="NUMBER_0">%d</xliff:g> пута. "\n\n"Покушајте поново за <xliff:g id="NUMBER_1">%d</xliff:g> секунде(и)."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Нацртали сте шаблон за откључавање неисправно <xliff:g id="NUMBER_0">%d</xliff:g> пута. "\n\n"Покушајте поново за <xliff:g id="NUMBER_1">%d</xliff:g> секунде(и)."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Нацртали сте шаблон за откључавање неисправно <xliff:g id="NUMBER_0">%d</xliff:g> пута. После још <xliff:g id="NUMBER_1">%d</xliff:g> неуспешна(их) покушаја, од вас ће бити затражено да откључате таблет помоћу налога е-поште."\n\n"Покушајте поново за <xliff:g id="NUMBER_2">%d</xliff:g> секунде(и)."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Нацртали сте шаблон за откључавање неисправно <xliff:g id="NUMBER_0">%d</xliff:g> пута. После још <xliff:g id="NUMBER_1">%d</xliff:g> неуспешна(их) покушаја, од вас ће бити затражено да откључате телефон помоћу налога е-поште."\n\n"Покушајте поново за <xliff:g id="NUMBER_2">%d</xliff:g> секунде(и)."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Желите да појачате звук изнад безбедног нивоа?"\n"Ако дуже време слушате гласну музику, може доћи до оштећења слуха."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Приступачност је омогућена."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 485052593f52..bbbcc8e30083 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Tillåter att appen hämtar systemets interna status. Skadliga appar kan hämta privat och skyddad information som normalt aldrig ska behövas."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"hämta skärminnehåll"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Tillåter att appen hämtar innehållet i det aktiva fönstret. Skadliga appar kan hämta allt innehåll i fönstret och läsa all text utom lösenord."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"aktivera tillgänglighetsläget tillfälligt"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Tillåt att en app tillfälligt aktiverar tillgänglighetsläget på enheten. Skadliga appar kan aktivera tillgänglighetsläget utan användarens medgivande."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"hämta information om fönster"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Tillåter att appen hämtar information om fönstren från fönsterhanteraren. Skadliga appar kan hämta information som är avsedd för användning i det interna systemet."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"filtrera händelser"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Grafiskt lösenord har tagits bort"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"En cell har lagts till"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Grafiskt lösenord har slutförts"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Tillåt"</string> <string name="sms_control_no" msgid="625438561395534982">"Neka"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> vill skicka ett meddelande till <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Ditt mobilkonto kan komma att debiteras."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Ditt mobilkonto kommer att debiteras."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Detta "<font fgcolor="#ffffb060">"kan medföra debiteringar"</font>" på ditt mobilkonto."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Ditt mobilkonto kommer att debiteras."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Skickat"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Avbryt"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Kom ihåg mitt val"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Du kan ändra detta senare i Inställningar > Appar"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Tillåt alltid"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Tillåt aldrig"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-kortet togs bort"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Mobil"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Hörlurar"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dockningsstationens högtalare"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-ljud"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-ljud"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Klar"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Medieuppspelning"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Skannar…"</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Ansluter ..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Tillgängliga"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Ej tillgängligt"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Inbyggd skärm"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI-skärm"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Överlagring #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Ange PIN-kod för SIM-kortet"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Ange PIN-kod"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Ange lösenord"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK-kod"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Ny PIN-kod"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM-kortet är nu inaktiverat. Ange PUK-koden om du vill fortsätta. Kontakta operatören om du vill få mer information."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Ange önskad PIN-kod"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Bekräfta önskad PIN-kod"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Låser upp SIM-kort …"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Fel PIN-kod."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Ange en PIN-kod med 4 till 8 siffror."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Ange en PUK-kod med minst 8 siffror."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Ange PUK-koden och en ny PIN-kod"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"PUK-koden som du angav är felaktig."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK-koden ska vara minst åtta siffror."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Ange rätt PUK-kod igen. Om försöken upprepas inaktiveras SIM-kortet permanent."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-koderna stämmer inte överens"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"För många försök med grafiskt lösenord"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Logga in med ditt Google-konto om du vill låsa upp."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Användarnamn (e-post)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Logga in"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Ogiltigt användarnamn eller lösenord."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Har du glömt ditt användarnamn eller lösenord?"\n"Besök "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Kontrollerar …"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"SIM-kortet låses upp …"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Du har angett fel lösenord <xliff:g id="NUMBER_0">%d</xliff:g> gånger. "\n\n"Försök igen om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Du har angett fel lösenord <xliff:g id="NUMBER_0">%d</xliff:g> gånger. "\n\n"Försök igen om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Du har ritat ditt grafiska lösenord fel <xliff:g id="NUMBER_0">%d</xliff:g> gånger. "\n\n"Försök igen om <xliff:g id="NUMBER_1">%d</xliff:g> sekunder."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Du har ritat ditt grafiska lösenord fel <xliff:g id="NUMBER_0">%d</xliff:g> gånger. Efter ytterligare <xliff:g id="NUMBER_1">%d</xliff:g> försök ombeds du låsa upp surfplattan med ett e-postkonto."\n\n" Försök igen om <xliff:g id="NUMBER_2">%d</xliff:g> sekunder."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Du har ritat ditt grafiska lösenord fel <xliff:g id="NUMBER_0">%d</xliff:g> gånger. Efter ytterligare <xliff:g id="NUMBER_1">%d</xliff:g> försök ombeds du låsa upp mobilen med hjälp av ett e-postkonto."\n\n" Försök igen om <xliff:g id="NUMBER_2">%d</xliff:g> sekunder."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Vill du höja volymen över den säkra nivån?"\n"Om du lyssnar på hög volym under långa perioder kan din hörsel skadas."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Tillgänglighetsläget har aktiverats."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index 7e823200626e..8409cae52a67 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Inaruhusu programu kutoa hali ya ndani ya mfumo. Programu hasidi zinaweza kutoa aina nyingi za taarifa za faragha na salama ambazo kwa kawaida hazihitaji."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"epua maudhui ya skrini"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Inaruhusu programu kutoa maudhui ya dirisha amilifu. Programu hasidi zinaweza kutoa maudhui yote ya dirisha na kuchunguza maandishi yake yote isipokuwa nenosiri."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"wezesha ufikivu kwa muda"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Inaruhusu programu kuwezesha kwa muda ufikivu kwenye kifaa. Huenda programu hasidi zikawezesha ufikivu bila kibali cha mtumiaji."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"okoa maelezo ya dirisha"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Huruhusu programu kuokoa maelezo kuhusu madirisha kutoka kwenye kidhibiti dirisha. Huenda programu hasidi ikakusanya maelezo ambayo yamekusudiwa kwa matumizi ya mfumo wa ndani."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"chuja matukio"</string> @@ -812,6 +810,10 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Ruwaza imefutwa"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Kiini kimeongezwa"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Ruwaza imekamilika"</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Wijeti %2$d ya %3$d."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Kiteuzi cha mtumiaji"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Hali"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Vidhibiti vya midia"</string> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1103,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Ruhusu"</string> <string name="sms_control_no" msgid="625438561395534982">"Kataza"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ingependa kutuma ujumbe kwa <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Huenda huku kukasababisha gharama kwenye akaunti yako ya simu ya mkononi."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Huku kutasababisha gharama kwenye akaunti yako ya simu ya mkononi."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Hii "<font fgcolor="#ffffb060">"huenda ikasababisha gharama"</font>" kwenye akaunti yako ya simu."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Hii itasababisha gharama kwenye akaunti yako ya simu."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Tuma"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Ghairi"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Kumbuka chaguo yangu"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Unaweza kubadilisha hii baadaye kwenye Mipangilio > Programu"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Ruhusu Kila mara"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Usiruhusu Kamwe"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Kadi ya SIM imeondolewa"</string> @@ -1365,11 +1368,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Simu"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Vipokeasauti"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Vipasa sauti vya kituo"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Sauti ya HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Mfumo"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Sauti ya Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Kwisha"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Towe la midia"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Inatambaza..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Inaunganisha..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Inapatikana"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Haipatikani"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Skrini Iliyojengwa ndani"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Skrini ya HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Uwekeleaji #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1391,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Ingiza PIN ya SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Ingiza PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Ingiza Nenosiri"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Msimbo wa PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Msimbo mpya wa PIN"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM sasa imelemazwa. Ingiza msimbo wa PUK ili kuendelea. Wasiliana na mtoa huduma kwa maelezo."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Ingiza msimbo wa PIN uliopendelewa"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Thibitisha msimbo wa PIN uliopendelewa"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Inafungua kadi ya SIM..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Msimbo wa PIN usio sahihi."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Charaza PIN iliyo na tarakimu kati ya 4 na 8."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Andika PUK iliyo na urefu wa tarakimu 8 au zaidi."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Charaza PUK na msimbo mpya wa PIN"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"PUK uliyoicharaza siyo sahihi."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Msimbo wa PUK unafaa kuwa na nambari 8 au zaidi."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Ingiza upya msimbo sahihi wa PUK. Majaribio yaliyorudiwa yatalemaza kabisa SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Misimbo ya PIN haifanani"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Majaribio mengi mno ya mchoro"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Ili kufungua, ingia kwa Akaunti yako ya Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Jina la mtumiaji (barua pepe)"</string> @@ -1399,7 +1407,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Ingia"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Jina la mtumiaji au nenosiri batili."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Je, umesahau jina lako la mtumiaji au nenosiri?"\n"Tembela "<b>"Bgoogle.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Inakagua..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Inafungua SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Umeingiza nenosiri lako kwa makosa mara <xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n" Jaribu tena baada ya sekunde <xliff:g id="NUMBER_1">%d</xliff:g>."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Umeingiza nenosiri lako kwa makosa mara <xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n" Jaribu tena baada ya sekunde <xliff:g id="NUMBER_1">%d</xliff:g>."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Umechora ruwaza yako ya kufunga kwa makosa mara <xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n" Jaribu tena baada ya sekunde <xliff:g id="NUMBER_1">%d</xliff:g>."</string> @@ -1410,12 +1418,8 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Umekosea katika kuweka mchoro wako wa kufungua mara <xliff:g id="NUMBER_0">%d</xliff:g>. Baada ya majaribio <xliff:g id="NUMBER_1">%d</xliff:g> bila kufaulu, utaombwa kufungua kompyuta yako ndogo kwa kutumia akaunti yako ya barua pepe."\n\n" Jaribu tena baada ya sekunde <xliff:g id="NUMBER_2">%d</xliff:g>."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Umekosea kuchora mchoro wako wa kufungua mara <xliff:g id="NUMBER_0">%d</xliff:g>. Baada ya majaribio <xliff:g id="NUMBER_1">%d</xliff:g> yasiyofaulu, utaombwa kufungua simu yako kwa kutumia akaunti ya barua pepe."\n\n" Jaribu tena baada ya sekunde <xliff:g id="NUMBER_2">%d</xliff:g>."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Ongeza sauti zaidi ya kiwango salama? "\n"Kusikiliza kwa sauti ya juu kwa muda mrefu kunaweza kuharibu uwezo wako wa kusikia."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> - <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> - <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> - <skip /> + <string name="continue_to_enable_accessibility" msgid="2184747411804432885">"Endelea kushikilia chini vidole vyako viwili ili kuwezesha ufikivu."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"Ufikivu umewezeshwa."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Ufikivu umeghairiwa."</string> + <string name="user_switched" msgid="3768006783166984410">"Mtumiaji wa sasa <xliff:g id="NAME">%1$s</xliff:g>."</string> </resources> diff --git a/core/res/res/values-sw600dp/dimens.xml b/core/res/res/values-sw600dp/dimens.xml index 4e202ac4de33..0c36d4a91d72 100644 --- a/core/res/res/values-sw600dp/dimens.xml +++ b/core/res/res/values-sw600dp/dimens.xml @@ -77,5 +77,13 @@ <!-- Preference fragment padding, sides --> <dimen name="preference_fragment_padding_side">24dp</dimen> <dimen name="preference_screen_header_padding_side">24dip</dimen> + + <!-- Keyguard dimensions --> + <!-- Bottom padding for the widget pager --> + <dimen name="kg_widget_pager_bottom_padding">16dp</dimen> + + <!-- Top margin for the runway lights. We add a negative margin in large + devices to account for the widget pager padding --> + <dimen name="kg_runway_lights_top_margin">-10dp</dimen> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index fd2cfa8e7e83..15875de2381c 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"อนุญาตให้แอปพลิเคชันเรียกดูสถานะภายในของระบบ แอปพลิเคชันที่เป็นอันตรายอาจเรียกดูข้อมูลส่วนบุคคลและข้อมูลที่ต้องรักษาความปลอดภัยหลากหลายประเภทที่ปกติแล้วไม่จำเป็นต้องใช้แต่อย่างใด"</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"ดึงเนื้อหาหน้าจอ"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"อนุญาตให้แอปพลิเคชันดึงเนื้อหาของหน้าต่างที่ใช้งานอยู่ แอปพลิเคชันที่เป็นอันตรายอาจดึงเนื้อหาจากหน้าต่างทั้งหมดและตรวจสอบข้อความทั้งหมดยกเว้นรหัสผ่าน"</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"เปิดใช้งานการเข้าถึงชั่วคราว"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"ช่วยให้แอปพลิเคชันสามารถเปิดใช้งานการเข้าถึงบนอุปกรณ์เป็นการชั่วคราว แอปพลิเคชันที่เป็นอันตรายอาจเปิดใช้งานการเข้าถึงโดยไม่ได้รับความยินยอมจากผู้ใช้"</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"เรียกข้อมูลหน้าต่าง"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"อนุญาตให้แอปพลิเคชันดึงข้อมูลเกี่ยวกับหน้าต่างจากเครื่องมือจัดการหน้าต่าง แอปพลิเคชันที่เป็นอันตรายอาจดึงข้อมูลที่มีไว้เพื่อการใช้ของระบบภายใน"</string> <string name="permlab_filter_events" msgid="8675535648807427389">"กรองกิจกรรม"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"ล้างรูปแบบแล้ว"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"เพิ่มเซลแล้ว"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"วาดรูปแบบเสร็จสิ้น"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1094,18 +1100,19 @@ <string name="wifi_p2p_to_message" msgid="248968974522044099">"ถึง:"</string> <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"พิมพ์ PIN ที่ต้องการ:"</string> <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string> - <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"โืทรศัพท์จะยกเลิกการเชื่อมต่อกับ Wi-Fi ชั่วคราวในขณะที่เชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> + <string name="wifi_p2p_frequency_conflict_message" msgid="7363907213787469151">"โทรศัพท์จะยกเลิกการเชื่อมต่อกับ Wi-Fi ชั่วคราวในขณะที่เชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> <string name="select_character" msgid="3365550120617701745">"ใส่อักขระ"</string> <string name="sms_control_title" msgid="7296612781128917719">"กำลังส่งข้อความ SMS"</string> <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> กำลังส่งข้อความ SMS จำนวนมาก คุณต้องการอนุญาตให้แอปพลิเคชันนี้ส่งข้อความต่อหรือไม่"</string> <string name="sms_control_yes" msgid="3663725993855816807">"อนุญาต"</string> <string name="sms_control_no" msgid="625438561395534982">"ปฏิเสธ"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ต้องการส่งข้อความไปยัง <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>"</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"การดำเนินการนี้อาจมีการเรียกเก็บเงินในบัญชีมือถือของคุณ"</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"การดำเนินการนี้จะมีการเรียกเก็บเงินในบัญชีมือถือของคุณ"</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"การดำเนินการนี้"<font fgcolor="#ffffb060">"อาจมีค่าใช้จ่ายเพิ่มเติม"</font>"สำหรับบัญชีมือถือของคุณ"</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"การดำเนินการนี้อาจมีค่าใช้จ่ายเพิ่มเติมสำหรับบัญชีมือถือของคุณ"</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"ส่ง"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"ยกเลิก"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"จดจำตัวเลือกของฉัน"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"คุณสามารถเปลี่ยนค่านี้ภายหลังในการตั้งค่า > แอปพลิเคชัน"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"อนุญาตทุกครั้ง"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"ไม่อนุญาตเลย"</string> <string name="sim_removed_title" msgid="6227712319223226185">"นำซิมการ์ดออกแล้ว"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"โทรศัพท์"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"หูฟัง"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"ลำโพงแท่นชาร์จ"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"เสียง HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"ระบบ"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"เสียงบลูทูธ"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"เสร็จสิ้น"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"เอาต์พุตสื่อ"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"กำลังสแกน..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"กำลังเชื่อมต่อ..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"พร้อมใช้งาน"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"ไม่พร้อมใช้งาน"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"หน้าจอในตัว"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"หน้าจอ HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"การวางซ้อน #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"ป้อน PIN ของซิม"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"ป้อน PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"ป้อนรหัสผ่าน"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"รหัส PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"รหัส PIN ใหม่"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"ซิมการ์ดถูกปิดใช้งานแล้วในตอนนี้ ป้อนรหัส PUK เพื่อดำเนินการต่อ โปรดติดต่อผู้ให้บริการสำหรับรายละเอียด"</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"ป้อนรหัส PIN ที่ต้องการ"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"ยืนยันรหัส PIN ที่ต้องการ"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"กำลังปลดล็อกซิมการ์ด…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"รหัส PIN ไม่ถูกต้อง"</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"พิมพ์ PIN ซึ่งเป็นเลข 4 ถึง 8 หลัก"</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"พิมพ์ PUK ซึ่งต้องเป็นตัวเลขอย่างน้อย 8 หลัก"</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"พิมพ์ PUK และรหัส PIN ใหม่"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"PUK ที่คุณพิมพ์ไม่ถูกต้อง"</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"รหัส PUK ต้องเป็นตัวเลขอย่างน้อย 8 หลัก"</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"ใส่รหัส PUK ที่ถูกต้องอีกครั้ง การพยายามซ้ำหลายครั้งจะทำให้ซิมการ์ดถูกปิดใช้งานอย่างถาวร"</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"รหัส PIN ไม่ตรง"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"ลองหลายรูปแบบมากเกินไป"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"หากต้องการปลดล็อก ให้ลงชื่อเข้าใช้ด้วยบัญชี Google ของคุณ"</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"ชื่อผู้ใช้ (อีเมล)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"ลงชื่อเข้าใช้"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"หากลืมชื่อผู้ใช้หรือรหัสผ่าน"\n"โปรดไปที่ "<b>"google.com/accounts/recovery"</b></string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"กำลังตรวจสอบ…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"กำลังปลดล็อกซิม…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"คุณพิมพ์ PIN ไม่ถูกต้องไป <xliff:g id="NUMBER_0">%d</xliff:g> ครั้งแล้ว "\n\n"โปรดลองอีกครั้งใน <xliff:g id="NUMBER_1">%d</xliff:g> วินาที"</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"คุณพิมพ์รหัสผ่านไม่ถูกต้องไป <xliff:g id="NUMBER_0">%d</xliff:g> ครั้งแล้ว "\n\n"โปรดลองอีกครั้งใน <xliff:g id="NUMBER_1">%d</xliff:g> วินาที"</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"คุณวาดรูปแบบการปลดล็อกไม่ถูกต้องไป <xliff:g id="NUMBER_0">%d</xliff:g> ครั้งแล้ว "\n\n"โปรดลองอีกครั้งใน <xliff:g id="NUMBER_1">%d</xliff:g> วินาที"</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"คุณวาดรูปแบบการปลดล็อกไม่ถูกต้อง <xliff:g id="NUMBER_0">%d</xliff:g> ครั้งแล้ว หากทำไม่สำเร็จอีก <xliff:g id="NUMBER_1">%d</xliff:g> ครั้ง ระบบจะขอให้คุณปลดล็อกแท็บเล็ตโดยใช้บัญชีอีเมล"\n\n" โปรดลองอีกครั้งใน <xliff:g id="NUMBER_2">%d</xliff:g> วินาที"</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"คุณวาดรูปแบบการปลดล็อกไม่ถูกต้อง <xliff:g id="NUMBER_0">%d</xliff:g> ครั้งแล้ว หากทำไม่สำเร็จอีก <xliff:g id="NUMBER_1">%d</xliff:g> ครั้ง ระบบจะขอให้คุณปลดล็อกโทรศัพท์โดยใช้ับัญชีอีเมล"\n\n" โปรดลองอีกครั้งในอีก <xliff:g id="NUMBER_2">%d</xliff:g> วินาที"</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"เพิ่มระดับเสียงจนเกินระดับที่ปลอดภัยหรือไม่"\n"การฟังเสียงดังเป็นเวลานานอาจทำให้การได้ยินของคุณบกพร่องได้"</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"เปิดใช้งานการเข้าถึงแล้ว"</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index 8bfa8c3b7b2f..f755841690fe 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Pinapayagan ang app na mabawi ang panloob na katayuan ng system. Maaaring bawiin ng nakakahamak na apps ang iba\'t ibang pribado at secure na impormasyon na hindi kailanman normal na kinakailangan ng mga ito."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"kunin ang nilalaman ng screen"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Pinapayagan ang app na bawiin ang nilalaman ng aktibong window. Maaaring bawiin ng nakakahamak na apps ang kabuuang nilalaman ng window at suriin ang lahat ng teksto nito maliban sa mga password."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"pansamantalang paganahin ang accessibility"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Nagbibigay-daan sa isang application na pansamantalang paganahin ang accessibility sa device. Maaaring paganahin ng nakakahamak na apps ang accessibility nang walang pahintulot ng user."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"kunin ang impormasyon ng window"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Pinapayagan ang application na kumuha ng impormasyon tungkol sa mga window mula sa tagapamahala ng window. Maaaring kumuha ang mga nakakahamak na app ng impormasyong nilayon para sa panloob na paggamit ng system."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"i-filter ang mga kaganapan"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Na-clear ang pattern"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Idinagdag ang cell"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Nakumpleto ang pattern"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Payagan"</string> <string name="sms_control_no" msgid="625438561395534982">"Tanggihan"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"Gustong magpadala ng mensahe ng <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> sa <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Maaaring maging sanhi ito ng mga pagsingil sa iyong mobile account."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Magiging sanhi ito ng mga pagsingil sa iyong mobile account."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Magsasanhi ito "<font fgcolor="#ffffb060">"ng mga pagsingil"</font>" sa iyong mobile account."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Magsasanhi ito ng mga pagsingil sa iyong mobile account."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Ipadala"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Kanselahin"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Tandaan ang aking pinili"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Mapapalitan mo ito sa ibang pagkakataon sa Mga Setting > Apps"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Palaging Payagan"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Huwag kailanman Payagan"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Naalis ang SIM card"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telepono"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Mga Headphone"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Mga speaker ng dock"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI audio"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Audio sa Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Tapos na"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Output ng media"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Nagsa-scan..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Kumukonekta..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Available"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Hindi available"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Built-in na Screen"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI Screen"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Overlay #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Ilagay ang SIM PIN"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Ilagay ang PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Ilagay ang Password"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK code"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Bagong PIN code"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Hindi na pinagana ang SIM ngayon. Maglagay ng PUK code upang magpatuloy. Makipag-ugnay sa carrier para sa mga detalye."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Ilagay ang ninanais na PIN code"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Kumpirmahin ang ninanais na PIN code"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Ina-unlock ang SIM card…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Hindi tamang PIN code."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Mag-type ng PIN na 4 hanggang 8 numero."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Mag-type ng PUK na may 8 numbero o mas mahaba."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"I-type ang PUK at bagong PIN code"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Hindi tama ang na-type mong PUK."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Dapat ay 8 numero o higit pa ang PUK code."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Muling ilagay ang tamang PUK code. Permanenteng hindi pagaganahin ang SIM ng mga paulit-ulit na pagtatangka."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Hindi tumutugma ang mga PIN code"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Masyadong maraming pagtatangka sa pattern"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Upang i-unlock, mag-sign in gamit ang iyong Google account."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Username (email)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Mag-sign in"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Di-wastong username o password."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Nakalimutan ang iyong username o password?"\n"Bisitahin ang "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Sinusuri…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Ina-unlock ang SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Na-type mo nang hindi tama ang iyong PIN nang <xliff:g id="NUMBER_0">%d</xliff:g> (na) beses. "\n\n"Subukang muli sa loob ng <xliff:g id="NUMBER_1">%d</xliff:g> (na) segundo."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Na-type mo nang hindi tama ang iyong password nang <xliff:g id="NUMBER_0">%d</xliff:g> (na) beses. "\n\n"Subukang muli sa loob ng <xliff:g id="NUMBER_1">%d</xliff:g> (na) segundo."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Naguhit mo nang hindi tama ang iyong pattern sa pag-unlock nang <xliff:g id="NUMBER_0">%d</xliff:g> (na) beses. "\n\n"Subukang muli sa loob ng <xliff:g id="NUMBER_1">%d</xliff:g> (na) segundo."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Naguhit mo nang hindi tama ang iyong pattern sa pag-unlock nang <xliff:g id="NUMBER_0">%d</xliff:g> (na) beses. Pagkatapos ng <xliff:g id="NUMBER_1">%d</xliff:g> pang hindi matagumpay na pagtatangka, hihilingin sa iyong i-unlock ang tablet mo gamit ang isang email account."\n\n" Subukang muli sa loob ng <xliff:g id="NUMBER_2">%d</xliff:g> (na) segundo."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Naguhit mo nang hindi tama ang iyong pattern sa pag-unlock nang <xliff:g id="NUMBER_0">%d</xliff:g> (na) beses. Pagkatapos ng <xliff:g id="NUMBER_1">%d</xliff:g> pang hindi matagumpay na pagtatangka, hihilingin sa iyong i-unlock ang telepono mo gamit ang isang email account."\n\n" Subukang muli sa loob ng <xliff:g id="NUMBER_2">%d</xliff:g> (na) segundo."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Lakasan ang volume nang lagpas sa ligtas na antas?"\n"Maaaring mapinsala ng pakikinig sa malakas na volume sa loob ng mahahabang panahon ang iyong pandinig."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Pinagana ang accessibility."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index a85f58c9fbb5..ede22d8a5787 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Uygulamaya, sistemin iç durumunu alma izni verir. Kötü amaçlı uygulamalar normalde gerek duymadıkları çok çeşitli özel ve güvenli bilgilerini alabilir."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"ekran içeriğini al"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Uygulamaya, etkin pencerenin içeriğini alma izni verir. Kötü amaçlı uygulamalar tüm pencere içeriğini alabilir ve şifreleri hariç tüm metni inceleyebilir."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"erişilebilirliği geçici olarak etkinleştir"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Uygulamaya, cihazda erişilebilirliği geçici olarak etkinleştirme izni verir. Kötü amaçlı uygulamalar, kullanıcının izni olmadan erişilebilirliği etkinleştirebilirler."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"pencere bilgilerini al"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Uygulamaya, pencere yöneticisinden pencerelerle ilgili bilgi alma izni verir. Zararlı uygulamalar dahili sistem kullanımına yönelik bilgileri alabilir."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"etkinlikleri filtrele"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Desen temizlendi"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Hücre eklendi"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Desen tamamlandı"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"İzin ver"</string> <string name="sms_control_no" msgid="625438561395534982">"Reddet"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>, <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> adresine bir mesaj göndermek istiyor."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Bu işlem, mobil hesabınızdan ücret alınmasına neden olabilir."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Bu, mobil hesabınızdan ücret alınmasına neden olacaktır."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Gönder"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"İptal"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Seçimimi hatırla"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Her Zaman İzin Ver"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Asla İzin Verme"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM kart çıkarıldı"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Telefon"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Kulaklıklar"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Yuva hoparlörleri"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI ses"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistem"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth ses"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Tamamlandı"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Medya çıkışı"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Yerleşik Ekran"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI Ekran"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Yer Paylaşımı No. <xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"SIM PIN kodunu girin"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"PIN\'i girin"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Şifreyi Girin"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK kodu"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Yeni PIN kodu"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM kart kilidi açılıyor…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Yanlış PIN kodu."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"4-8 rakamdan oluşan bir PIN girin."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"8 veya daha uzun basamaklı bir PUK kodu yazın."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"PUK ve yeni PIN kodunu yazın"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Yazdığınız PUK doğru değil."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Çok fazla sayıda desen denemesi yapıldı"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Kilidi açmak için Google hesabınızla oturum açın."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Kullanıcı adı (e-posta)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Oturum aç"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Geçersiz kullanıcı adı veya şifre."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Kullanıcı adınızı veya şifrenizi mi unuttunuz?"\n<b>"google.com/accounts/recovery"</b>" adresini ziyaret edin."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Kontrol ediliyor…"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"PIN kodunuzu <xliff:g id="NUMBER_0">%d</xliff:g> kez yanlış girdiniz. "\n\n"<xliff:g id="NUMBER_1">%d</xliff:g> saniye içinde tekrar deneyin."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Şifrenizi <xliff:g id="NUMBER_0">%d</xliff:g> kez yanlış yazdınız. "\n\n"<xliff:g id="NUMBER_1">%d</xliff:g> saniye içinde tekrar deneyin."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Kilit açma deseninizi <xliff:g id="NUMBER_0">%d</xliff:g> kez yanlış çizdiniz. "\n\n"<xliff:g id="NUMBER_1">%d</xliff:g> saniye içinde tekrar deneyin."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Kilit açma deseninizi <xliff:g id="NUMBER_0">%d</xliff:g> kez yanlış çizdiniz. <xliff:g id="NUMBER_1">%d</xliff:g> başarısız denemeden sonra, tabletinizi bir e-posta hesabı kullanarak açmanız istenir."\n\n" <xliff:g id="NUMBER_2">%d</xliff:g> saniye içinde tekrar deneyin."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Kilit açma deseninizi <xliff:g id="NUMBER_0">%d</xliff:g> kez yanlış çizdiniz. <xliff:g id="NUMBER_1">%d</xliff:g> başarısız denemeden sonra telefonunuzu bir e-posta hesabı kullanarak açmanız istenir."\n\n" <xliff:g id="NUMBER_2">%d</xliff:g> saniye içinde tekrar deneyin."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Ses düzeyi güvenli seviyenin üzerine çıkarılsın mı?"\n"Yüksek sesle uzun süre dinlemek işitme yetinize zarar verebilir."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Erişilebilirlik etkinleştirildi."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 6d462f0cb9a3..b1abec3578dd 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Дозволяє програмі отримувати дані про внутрішній стан системи. Шкідливі програми можуть отримувати значну кількість особистої та конфіденційної інформації, яка для них не призначена."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"отримувати вміст екрана"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Дозволяє програмі отримувати вміст активного вікна. Шкідливі програми можуть отримувати весь вміст вікна та вивчати весь його текст, окрім паролів."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"тимчасово вмикати доступність"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Дозволяє програмі тимчасового вмикати доступність на пристрої. Шкідливі програми можуть вмикати доступність без згоди користувача."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"отримувати інформацію про вікна"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Дозволяє програмі отримувати інформацію про вікна від диспетчера вікон. Шкідливі програми можуть отримувати інформацію, яка призначена для внутрішнього користування системи."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"фільтрувати події"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Ключ очищено"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Телефон додано"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Малювання ключа закінчено"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Дозволити"</string> <string name="sms_control_no" msgid="625438561395534982">"Відмовити"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> хоче надіслати повідомлення на таку адресу: <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Можуть стягуватися кошти з вашого мобільного рахунку."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Буде стягнено кошти з вашого мобільного рахунку."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Це "<font fgcolor="#ffffb060">"може призвести до стягнення плати"</font>" з вашого рахунку в оператора мобільного зв’язку."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Це призведе до стягнення плати з вашого рахунку в оператора мобільного зв’язку."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Надіслати"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Скасувати"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Запам’ятати мій вибір"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Можна змінити згодом у Налаштування > Програми"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Завжди дозволяти"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Ніколи не дозволяти"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM-карту вилучено"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Телефон"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Навушники"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Динаміки док-станції"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Аудіовихід HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Система"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Аудіо Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Готово"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Вивід медіа-даних"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Сканування..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"З’єднання..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Доступно"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Недоступно"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Вбудований екран"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Екран HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Накладання №<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Введіть PIN-код SIM-карти"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Введіть PIN-код"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Введіть пароль"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK-код"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Новий PIN-код"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Зараз SIM-карту вимкнено. Введіть PUK-код, щоб продовжити. Зв’яжіться з оператором, щоб дізнатися більше."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Введіть потрібний PIN-код"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Підтвердьте потрібний PIN-код"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Розблокування SIM-карти…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Неправильний PIN-код."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Введіть PIN-код із 4–8 цифр."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Введіть PUK-код із 8 або більше цифр."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Введіть PUK-код і новий PIN-код"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"Введений PUK-код не правильний."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK-код має складатися зі щонайменше 8 цифр."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Повторно введіть правильний PUK-код. Численні спроби назавжди вимкнуть SIM-карту."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-коди не збігаються"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Забагато спроб намалювати ключ"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Щоб розблокувати, увійдіть, використовуючи дані облікового запису Google."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Ім’я користувача (електронна адреса)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Увійти"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Недійсне ім’я користувача чи пароль."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Не пам’ятаєте ім’я користувача чи пароль?"\n"Відвідайте сторінку "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Перевірка…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Розблокування SIM-карти…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"PIN-код неправильно введено стільки разів: <xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n"Повторіть спробу через <xliff:g id="NUMBER_1">%d</xliff:g> с."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Пароль неправильно введено стільки разів: <xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n"Повторіть спробу через <xliff:g id="NUMBER_1">%d</xliff:g> с."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Ключ розблокування неправильно намальовано стільки разів: <xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n"Повторіть спробу через <xliff:g id="NUMBER_1">%d</xliff:g> с."</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Ключ розблокування неправильно намальовано стільки разів: <xliff:g id="NUMBER_0">%d</xliff:g>. У вас є ще стільки спроб: <xliff:g id="NUMBER_1">%d</xliff:g>. У разі невдачі з’явиться запит розблокувати планшетний ПК за допомогою облікового запису електронної пошти."\n\n" Повторіть спробу через <xliff:g id="NUMBER_2">%d</xliff:g> сек."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Ключ розблокування неправильно намальовано стільки разів: <xliff:g id="NUMBER_0">%d</xliff:g>. У вас є ще стільки спроб: <xliff:g id="NUMBER_1">%d</xliff:g>. У разі невдачі з’явиться запит розблокувати телефон за допомогою облікового запису електронної пошти."\n\n" Повторіть спробу через <xliff:g id="NUMBER_2">%d</xliff:g> сек."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Збільшити гучність понад безпечний рівень?"\n"Надто гучне прослуховування впродовж тривалого періоду може пошкодити слух."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Доступність увімкнено."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index c4518880e0f9..c7e9392a74e5 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Cho phép ứng dụng truy xuất trạng thái nội bộ của hệ thống. Ứng dụng độc hại có thể truy xuất nhiều loại thông tin riêng tư và bảo mật khác nhau mà thông thường chúng không bao giờ cần."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"truy xuất nội dung màn hình"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Cho phép ứng dụng truy xuất nội dung của cửa sổ hiện hành. Ứng dụng độc hại có thể truy xuất toàn bộ nội dung của cửa sổ cũng như xem xét toàn bộ văn bản của cửa sổ ngoại trừ mật khẩu."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"tạm thời bật trợ năng"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Cho phép ứng dụng tạm thời bật trợ năng trên thiết bị. Các ứng dụng độc hại có thể bật trợ năng mà không có sự đồng ý của người dùng."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"truy xuất thông tin cửa sổ"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Cho phép ứng dụng truy xuất thông tin về các cửa sổ từ trình quản lý cửa sổ. Các ứng dụng độc hại có thể truy xuất thông tin được dành để sử dụng trong hệ thống nội bộ."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"lọc sự kiện"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Đã xóa hình"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Đã thêm ô"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Đã vẽ xong hình"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,15 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Cho phép"</string> <string name="sms_control_no" msgid="625438561395534982">"Từ chối"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> muốn gửi thư đến <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Điều này có thể khiến bạn phải trả phí cho tài khoản di động của mình."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Điều này sẽ dẫn đến việc tính phí vào tài khoản di động của bạn."</string> + <!-- no translation found for sms_short_code_details (3492025719868078457) --> + <skip /> + <!-- no translation found for sms_premium_short_code_details (5523826349105123687) --> + <skip /> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Gửi"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Hủy"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Nhớ lựa chọn của tôi"</string> + <!-- no translation found for sms_short_code_remember_undo_instruction (4960944133052287484) --> + <skip /> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Luôn cho phép"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Không bao giờ cho phép"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Đã xóa thẻ SIM"</string> @@ -1365,11 +1375,20 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Điện thoại"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Tai nghe"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Loa đế"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Âm thanh HDMI"</string> + <!-- no translation found for default_media_route_name_hdmi (2450970399023478055) --> + <skip /> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Hệ thống"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Âm thanh Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Xong"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Đầu ra phương tiện"</string> + <!-- no translation found for media_route_status_scanning (7279908761758293783) --> + <skip /> + <!-- no translation found for media_route_status_connecting (6422571716007825440) --> + <skip /> + <!-- no translation found for media_route_status_available (6983258067194649391) --> + <skip /> + <!-- no translation found for media_route_status_not_available (6739899962681886401) --> + <skip /> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Màn hình tích hợp"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Màn hình HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Lớp phủ #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1403,21 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Nhập PIN của SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Nhập PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Nhập mật khẩu"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Mã PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Mã PIN mới"</string> + <!-- no translation found for kg_puk_enter_puk_hint (453227143861735537) --> + <skip /> + <!-- no translation found for kg_puk_enter_pin_hint (7871604527429602024) --> + <skip /> + <!-- no translation found for kg_enter_confirm_pin_hint (325676184762529976) --> + <skip /> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Đang mở khóa thẻ SIM…"</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Mã PIN không chính xác."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Nhập mã PIN có từ 4 đến 8 số."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Nhập PUK có từ 8 số trở lên."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Nhập PUK và mã PIN mới"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"PUK bạn đã nhập không đúng."</string> + <!-- no translation found for kg_invalid_sim_puk_hint (7553388325654369575) --> + <skip /> + <!-- no translation found for kg_invalid_puk (3638289409676051243) --> + <skip /> + <!-- no translation found for kg_invalid_confirm_pin_hint (7003469261464593516) --> + <skip /> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Quá nhiều lần nhập hình"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Để mở khóa, hãy đăng nhập bằng tài khoản Google của bạn."</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Tên người dùng (email)"</string> @@ -1399,7 +1425,8 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Đăng nhập"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Tên người dùng hoặc mật khẩu không hợp lệ."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Bạn quên tên người dùng hoặc mật khẩu?"\n"Hãy truy cập "<b>"google.com/accounts/recovery"</b>"."</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Đang kiểm tra…"</string> + <!-- no translation found for kg_login_checking_password (5316091912653672681) --> + <skip /> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Bạn đã <xliff:g id="NUMBER_0">%d</xliff:g> lần nhập sai mã PIN của mình. Hãy "\n\n"thử lại sau <xliff:g id="NUMBER_1">%d</xliff:g> giây."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Bạn đã <xliff:g id="NUMBER_0">%d</xliff:g> lần nhập sai mật khẩu của mình. Hãy "\n\n"thử lại sau <xliff:g id="NUMBER_1">%d</xliff:g> giây."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Bạn đã <xliff:g id="NUMBER_0">%d</xliff:g> lần vẽ không chính xác hình mở khóa của mình. Hãy "\n\n"thử lại sau <xliff:g id="NUMBER_1">%d</xliff:g> giây."</string> @@ -1410,12 +1437,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Bạn đã <xliff:g id="NUMBER_0">%d</xliff:g> lần vẽ không chính xác hình mở khóa của mình. Sau <xliff:g id="NUMBER_1">%d</xliff:g> lần thử không thành công nữa, bạn sẽ được yêu cầu mở khóa máy tính bảng bằng tài khoản email."\n\n" Vui lòng thử lại sau <xliff:g id="NUMBER_2">%d</xliff:g> giây."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Bạn đã <xliff:g id="NUMBER_0">%d</xliff:g> lần vẽ không chính xác hình mở khóa của mình. Sau <xliff:g id="NUMBER_1">%d</xliff:g> lần thử không thành công nữa, bạn sẽ được yêu cầu mở khóa điện thoại bằng tài khoản email."\n\n" Vui lòng thử lại sau <xliff:g id="NUMBER_2">%d</xliff:g> giây."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Tăng âm lượng trên mức an toàn?"\n"Nghe ở âm lượng cao trong thời gian dài có thể gây hại cho thính giác của bạn."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Trợ năng đã được bật."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 888844efc0b0..6d85c9f1469f 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"允许应用检索系统的内部状态。恶意应用可能会检索一般情况下绝不需要检索的多种私人信息和安全信息。"</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"检索屏幕内容"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"允许应用检索活动窗口的内容。恶意应用可能会检索整个窗口的内容，并检查其中除密码以外的所有文字。"</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"暂时启用辅助功能"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"允许应用在设备上暂时启用辅助功能。恶意应用可能会在未经用户同意的情况下擅自启用辅助功能。"</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"检索窗口信息"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"允许应用通过窗口管理器检索窗口信息。恶意应用可能会检索供内部系统使用的信息。"</string> <string name="permlab_filter_events" msgid="8675535648807427389">"过滤事件"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"图案已清除"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"已添加单元格"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"图案绘制完成"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"允许"</string> <string name="sms_control_no" msgid="625438561395534982">"拒绝"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b>想要向 <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b> 发送一条短信。"</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"这可能会导致您的手机号产生费用。"</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"这会导致您的手机号产生费用。"</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"这可能会"<font fgcolor="#ffffb060">"导致您的移动帐户支付费用"</font>"。"</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"这会导致您的移动帐户支付费用。"</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"发送"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"取消"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"记住我的选择"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"以后，您可以在“设置”>“应用”中更改此内容"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"始终允许"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"永不允许"</string> <string name="sim_removed_title" msgid="6227712319223226185">"已移除 SIM 卡"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"手机"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"耳机"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"基座扬声器"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI 音频"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"系统"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"蓝牙音频"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"完成"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"媒体输出线路"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"正在扫描..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"正在连接..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"可以连接"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"无法连接"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"内置屏幕"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI 屏幕"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"叠加视图 #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"输入 SIM PIN"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"输入 PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"输入密码"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK 码"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"新的 PIN 码"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM 卡现已停用，需要输入 PUK 码才能继续使用。有关详情，请联系您的运营商。"</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"请输入所需 PIN 码"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"请确认所需 PIN 码"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"正在解锁 SIM 卡..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"PIN 码有误。"</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"请输入 4 至 8 位数的 PIN。"</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"请输入至少 8 位数的 PUK。"</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"请输入 PUK 和新的 PIN 码"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"您输入的 PUK 不正确。"</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK 码应至少包含 8 位数字。"</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"请重新输入正确的 PUK 码。如果尝试错误次数过多，SIM 卡将永久停用。"</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN 码不匹配"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"图案尝试次数过多"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"要解锁，请登录您的 Google 帐户。"</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"用户名（电子邮件地址）"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"登录"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"用户名或密码无效。"</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"忘记了用户名或密码？"\n"请访问 "<b>"google.com/accounts/recovery"</b>"。"</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"正在检查..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"正在解锁 SIM 卡…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地输入了 PIN。"\n\n"请在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒后重试。"</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地输入了密码。"\n\n"请在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒后重试。"</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地绘制了解锁图案。"\n\n"请在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒后重试。"</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地绘制了解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%d</xliff:g> 次后仍不成功，系统就会要求您使用自己的电子邮件帐户解锁平板电脑。"\n\n"请在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒后重试。"</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地绘制了解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%d</xliff:g> 次后仍不成功，系统就会要求您使用自己的电子邮件帐户解锁手机。"\n\n"请在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒后重试。"</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"将音量调高到安全级别以上？"\n"长时间聆听高音量可能会损伤听力。"</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"辅助功能已启用。"</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 14f1580d0661..959ac55c0005 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"允許應用程式擷取系統內部狀態。請注意，惡意應用程式可能利用此功能異常擷取各類私人資訊和安全性資訊。"</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"擷取螢幕內容"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"允許應用程式擷取使用中的視窗內容。請注意，惡意應用程式可能利用此功能擷取完整視窗內容，並檢視密碼之外的所有文字。"</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"暫時啟用協助工具"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"允許應用程式在裝置上暫時啟用協助工具。惡意應用程式可能藉此在未經使用者同意的情況下擅自啟用協助工具。"</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"擷取視窗資訊"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"允許應用程式透過視窗管理程式擷取視窗的相關資訊。請注意，惡意應用程式可能藉此擷取僅限內部系統使用的資訊。"</string> <string name="permlab_filter_events" msgid="8675535648807427389">"篩選活動"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"已清除解鎖圖形"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"已加入 1 格"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"已畫出解鎖圖形"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"允許"</string> <string name="sms_control_no" msgid="625438561395534982">"拒絕"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> 要求將訊息傳送至 <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>。"</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"這可能會透過您的行動帳戶計費。"</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"這會透過您的行動帳戶計費。"</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"這"<font fgcolor="#ffffb060">"可能會透過您的行動帳戶計費"</font>"。"</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"這會透過您的行動帳戶計費。"</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"傳送"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"取消"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"記住我的選擇"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"您日後可在 [設定] > [應用程式] 中進行變更。"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"一律允許"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"一律不允許"</string> <string name="sim_removed_title" msgid="6227712319223226185">"SIM 卡已移除"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"手機"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"耳機"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"座架喇叭"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI 音訊"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"系統"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"藍牙音訊"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"完成"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"媒體輸出"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"掃描中..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"連線中…"</string> + <string name="media_route_status_available" msgid="6983258067194649391">"可以使用"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"無法使用"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"內建畫面"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI 螢幕"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"第 <xliff:g id="ID">%1$d</xliff:g> 個重疊效果"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"輸入 SIM PIN"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"輸入 PIN"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"輸入密碼"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"PUK 碼"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"新 PIN 碼"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM 卡已遭停用，需輸入 PUK 碼才能繼續使用。詳情請洽您的行動通訊業者。"</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"輸入所需的 PIN 碼"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"確認所需的 PIN 碼"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"正在解除 SIM 卡鎖定..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"PIN 碼不正確。"</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"請輸入 4 到 8 碼的 PIN。"</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"請輸入 8 碼以上的 PUK。"</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"輸入 PUK 碼和新 PIN 碼"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"您輸入的 PUK 不正確。"</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK 碼應為 8 個以上數字。"</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"重新輸入正確的 PUK 碼。如果嘗試錯誤次數過多，SIM 卡將會永久停用。"</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN 碼不符"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"圖形嘗試次數過多"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"如要解除鎖定，請使用 Google 帳戶登入。"</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"使用者名稱 (電子郵件)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"登入"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"使用者名稱或密碼無效。"</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"忘了使用者名稱或密碼？"\n"請前往 "<b>"google.com/accounts/recovery"</b>"。"</string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"檢查中…"</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"正在解除 SIM 卡鎖定…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"您的 PIN 已輸錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次。"\n\n"請在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒後再試一次。"</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"您的密碼已輸錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次。"\n\n"請在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒後再試一次。"</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"您的解鎖圖形已畫錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次。"\n\n"請在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒後再試一次。"</string> @@ -1409,13 +1421,12 @@ <string name="kg_failed_attempts_now_wiping" product="default" msgid="4817627474419471518">"您嘗試解除這支手機的鎖定已失敗 <xliff:g id="NUMBER">%d</xliff:g> 次，手機現在將恢復原廠設定。"</string> <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"您的解鎖圖形已畫錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次，如果再嘗試 <xliff:g id="NUMBER_1">%d</xliff:g> 次仍未成功，系統就會要求您透過電子郵件帳戶解除平板電腦的鎖定狀態。"\n\n"請在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒後再試一次。"</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"您的解鎖圖形已畫錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次，如果再嘗試 <xliff:g id="NUMBER_1">%d</xliff:g> 次仍未成功，系統就會要求您透過電子郵件帳戶解除手機的鎖定狀態。"\n\n"請在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒後再試一次。"</string> - <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"將音量調高至安全等級以上？"\n"長時間聆聽偏高音量可能會損害您的聽力。"</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"要將音量調高到安全等級以上嗎？"\n"長時間聆聽偏高音量可能會損害您的聽力。"</string> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"協助工具已啟用。"</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 0fdea74e7804..609df7541a82 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -287,10 +287,8 @@ <string name="permdesc_dump" msgid="1778299088692290329">"Ivumela insiza ukuthi ithole kabusha ingaphakathi lesistimu. izinsiza ezinobungozi zingathola kabusha inqwaba yolwazi oluyimfihlo noluvikelekile ezingajwayele ukuthi ziludinge."</string> <string name="permlab_retrieve_window_content" msgid="8022588608994589938">"letha okuqukethwe kwesikrini"</string> <string name="permdesc_retrieve_window_content" msgid="3193269069469700265">"Ivumela insiza ukuthi ithole okuqukethe kwi-Window. Izinsiza ezinobungozi zingathola kabush iwindi eliphelele bese ibheka konke okuqukethwe ngaphandle kwaaaphasiwedi."</string> - <!-- no translation found for permlab_temporary_enable_accessibility (2312612135127310254) --> - <skip /> - <!-- no translation found for permdesc_temporary_enable_accessibility (8079456293182975464) --> - <skip /> + <string name="permlab_temporary_enable_accessibility" msgid="2312612135127310254">"nika amandla okwesikhashana ukufinyelela"</string> + <string name="permdesc_temporary_enable_accessibility" msgid="8079456293182975464">"Ivumela uhlelo lokusebenza ukunika amandla ukufinyelela kwesikhashana kuvidayisi. Izinhlelo zokusebenza ezingalungile zinganika amandla ukufinyelela ngaphandle kwemvume yomsebenzisi."</string> <string name="permlab_retrieve_window_info" msgid="8532295199112519378">"buyisa ulwazi lewindi"</string> <string name="permdesc_retrieve_window_info" msgid="4998836370424186849">"Ivumela uhlelo lokusebenza ukubuyisa ulwazi mayelana namawindi avela kumphathi wewindi. Izinhlelo zokusebenza zingabuyisa ulwazi olubhekiswe ukusetshenziselwa kohlelo lwangaphakathi."</string> <string name="permlab_filter_events" msgid="8675535648807427389">"hlunga imicimbi"</string> @@ -812,6 +810,14 @@ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Iphethini isusiwe"</string> <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Kwengezwe"</string> <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Iphethini isiphelile"</string> + <!-- no translation found for keyguard_accessibility_widget_changed (5678624624681400191) --> + <skip /> + <!-- no translation found for keyguard_accessibility_user_selector (1226798370913698896) --> + <skip /> + <!-- no translation found for keyguard_accessibility_status (8008264603935930611) --> + <skip /> + <!-- no translation found for keygaurd_accessibility_media_controls (262209654292161806) --> + <skip /> <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"?123"</string> <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"ALT"</string> @@ -1101,11 +1107,12 @@ <string name="sms_control_yes" msgid="3663725993855816807">"Vumela"</string> <string name="sms_control_no" msgid="625438561395534982">"Nqaba"</string> <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"I-<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> ingathanda ukuthumela umlayezo ku-<b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> - <string name="sms_short_code_details" msgid="4992814738863678373">"Lokhu kungabangela amashaji ku-akhawunti yakho yeselula."</string> - <string name="sms_premium_short_code_details" msgid="4291752905667807485">"Lokhu kuzobangela amashaji ku-akhawunti yakho yeselula."</string> + <string name="sms_short_code_details" msgid="3492025719868078457">"Lokhu "<font fgcolor="#ffffb060">"kungabangela amashaji"</font>" ku-akhawunti yakho yeselula."</string> + <string name="sms_premium_short_code_details" msgid="5523826349105123687"><font fgcolor="#ffffb060">"Lokhu kuzobangela amashaji ku-akhawunti yakho yeselula."</font></string> <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Thumela"</string> <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Khansela"</string> <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Khumbula inketho yami"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Ungashintsha lokhu kamuva kuzilungiselelo > izinhlelo zokusebenza"</string> <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Vumela njalo?"</string> <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Ungavumeli"</string> <string name="sim_removed_title" msgid="6227712319223226185">"Ikhadi le-SIM likhishiwe"</string> @@ -1365,11 +1372,15 @@ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Ifoni"</string> <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Ama-headphone"</string> <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Izipikha ze-Dock"</string> - <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Umsindo we-HDMI"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Isistimu"</string> <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Umsindo we-Bluetooth"</string> <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Qedile"</string> <string name="media_route_button_content_description" msgid="5758553567065145276">"Okukhiphayo kwemidiya"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Iyaskena..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Iyaxhuma..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Kuyatholakala"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Ayitholakali"</string> <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Okwakhelwe ngaphakathi kwesikrini"</string> <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Isikrini se-HDMI"</string> <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Isendlalelo #<xliff:g id="ID">%1$d</xliff:g>"</string> @@ -1384,14 +1395,15 @@ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Faka iphinikhodi ye-SIM"</string> <string name="kg_pin_instructions" msgid="2377242233495111557">"Faka iphinikhodi"</string> <string name="kg_password_instructions" msgid="5753646556186936819">"Faka iphasiwedi"</string> - <string name="kg_puk_enter_puk_hint" msgid="5183097160254244459">"Ikhodi le-PUK"</string> - <string name="kg_puk_enter_pin_hint" msgid="597821135578014901">"Iphinikhodi entsha"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"I-SIM manje ikhutshaziwe. Faka ikhodi ye-PUK ukuze uqhubeke. Xhumana nenkampani yenethiwekhi ngemininingwane."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Faka iphinikhodi oyithandayo"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Qiniseka iphinikhodi oyithandayo"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Ivula ikhadi le-SIM..."</string> <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Iphinikhodi engalungile."</string> <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Thayipha iphinikhodi enezinombolo ezingu-4 kuya kwezingu-8."</string> - <string name="kg_invalid_sim_puk_hint" msgid="5216603185442368307">"Thayipha i-PUK enezinombolo ezingu-8 noma ngaphezulu."</string> - <string name="kg_sim_puk_recovery_hint" msgid="5577753137718442566">"Faka i-PUK nephinikhodi entsha"</string> - <string name="kg_invalid_puk" msgid="5809955359950817326">"I-PUK oyithayiphile ayilungile."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Ikhodi ye-PUK kufanele ibe yizinombolo ezingu-8 noma eziningi."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Faka kabusha ikhodi ye-PUK elungile. Imizamo ephindiwe izokhubaza unaphakade i-SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Iphinikhodi ayifani"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Kunemizamo eminingi kakhulu yephathini"</string> <string name="kg_login_instructions" msgid="1100551261265506448">"Ukuvula, ngena ngemvume kwi-akhawunti ye-Google"</string> <string name="kg_login_username_hint" msgid="5718534272070920364">"Igama lomsebenzisi (i-imeyli)"</string> @@ -1399,7 +1411,7 @@ <string name="kg_login_submit_button" msgid="5355904582674054702">"Ngena ngemvume"</string> <string name="kg_login_invalid_input" msgid="5754664119319872197">"Igama lomsebezisi elingalungile noma iphasiwedi."</string> <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Ukhohlwe igama lomsebenzisi noma iphasiwedi?"\n"Vakashela"<b>"google.com/accounts/recovery"</b></string> - <string name="kg_login_checking_password" msgid="8849589033659332457">"Iyahlola..."</string> + <string name="kg_login_checking_password" msgid="5316091912653672681">"Ivula i-SIM…"</string> <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Ubhale iphinikhodi ykho ngendlela engafanele izikhathi ezingu-<xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n"Zama futhi emasekhondini angu-<xliff:g id="NUMBER_1">%d</xliff:g>."</string> <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Ubhale iphasiwedi yakho ngendlela engafanele <xliff:g id="NUMBER_0">%d</xliff:g> izikhathi. "\n\n"Zama futhi emasekhondini angu-<xliff:g id="NUMBER_1">%d</xliff:g>."</string> <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Udwebe iphathini yakho yokuvula ngendlela engafanele-<xliff:g id="NUMBER_0">%d</xliff:g>. "\n\n" Zama futhi emasekhondini angu-<xliff:g id="NUMBER_1">%d</xliff:g>"</string> @@ -1410,12 +1422,11 @@ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Udwebe ngokungalungile iphathini yakho yokuvula izikhathi ezingu-<xliff:g id="NUMBER_0">%d</xliff:g>. Emva <xliff:g id="NUMBER_1">%d</xliff:g> kweminye imizamo engaphumelelanga, uzocelwa ukuvula ithebhulethi yakho usebenzisa ukungena ngemvume kwi-Google."\n\n" Sicela uzame futhi kwengu-<xliff:g id="NUMBER_2">%d</xliff:g> imizuzwana."</string> <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Ukulayisha ungenisa iphathini yakho yokuvula ngendlela engalungile izikhathi ezi-<xliff:g id="NUMBER_0">%d</xliff:g> Emva kweminye imizamo engu-<xliff:g id="NUMBER_1">%d</xliff:g>, uzocelwa ukuvula ifoni yakho usebenzisa ukungena ngemvume ku-Google"\n\n" Zame futhi emumva kwengu- <xliff:g id="NUMBER_2">%d</xliff:g> imizuzwana."</string> <string name="safe_media_volume_warning" product="default" msgid="7382971871993371648">"Khulisa ivolomu ngaphezu kweleveli yokuphepha?"\n"Ukulalela ngevolomu ephezulu izikhathi ezide kungalimaza ukuzwa kwakho."</string> - <!-- no translation found for continue_to_enable_accessibility (7763028886898319514) --> - <skip /> - <!-- no translation found for accessibility_enabled (1381972048564547685) --> + <!-- no translation found for continue_to_enable_accessibility (2184747411804432885) --> <skip /> - <!-- no translation found for enable_accessibility_canceled (6820851401471507415) --> + <string name="accessibility_enabled" msgid="1381972048564547685">"Ukufinyelela kunikwe amandla."</string> + <!-- no translation found for enable_accessibility_canceled (3833923257966635673) --> <skip /> - <!-- no translation found for user_switched (1030428084901139446) --> + <!-- no translation found for user_switched (3768006783166984410) --> <skip /> </resources> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 07d0d7416239..6a93f3081863 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -115,6 +115,11 @@ <color name="lockscreen_clock_am_pm">#ffffffff</color> <color name="lockscreen_owner_info">#ff9a9a9a</color> + <!-- keyguard overscroll widget pager --> + <color name="kg_multi_user_text_active">#ffffffff</color> + <color name="kg_multi_user_text_inactive">#ff808080</color> + <color name="kg_widget_pager_gradient">#ff33B5E5</color> + <!-- FaceLock --> <color name="facelock_spotlight_mask">#CC000000</color> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d3d994ff2c21..16960c873703 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -967,4 +967,18 @@ <!-- Whether safe headphone volume is enabled or not (country specific). --> <bool name="config_safe_media_volume_enabled">true</bool> + <!-- Set to true if the wifi display supports compositing content stored + in gralloc protected buffers. For this to be true, there must exist + a protected hardware path for surface flinger to composite and send + protected buffers to the wifi display video encoder. + + If this flag is false, we advise applications not to use protected + buffers (if possible) when presenting content to a wifi display because + the content may be blanked. + + This flag controls whether the {@link Display#FLAG_SUPPORTS_PROTECTED_BUFFERS} + flag is set for wifi displays. + --> + <bool name="config_wifiDisplaySupportsProtectedBuffers">false</bool> + </resources> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 289adf49c46b..10f0d39b6faf 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -286,7 +286,7 @@ <dimen name="kg_runway_lights_height">7dp</dimen> <!-- The height of the runway lights strip --> - <dimen name="kg_runway_lights_vertical_padding">3dp</dimen> + <dimen name="kg_runway_lights_vertical_padding">2dp</dimen> <!-- Horizontal padding for the widget pager --> <dimen name="kg_widget_pager_horizontal_padding">16dp</dimen> @@ -297,6 +297,10 @@ <!-- Bottom padding for the widget pager --> <dimen name="kg_widget_pager_bottom_padding">6dp</dimen> + <!-- Top margin for the runway lights. We add a negative margin in large + devices to account for the widget pager padding --> + <dimen name="kg_runway_lights_top_margin">0dp</dimen> + <!-- Touch slop for the global toggle accessibility gesture --> <dimen name="accessibility_touch_slop">80dip</dimen> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 2f9ce0c53b01..fb8005ac0055 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2272,6 +2272,15 @@ <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] --> <string name="lockscreen_access_pattern_detected">Pattern completed</string> + <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] --> + <string name="keyguard_accessibility_widget_changed">%1$s. Widget %2$d of %3$d.</string> + <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] --> + <string name="keyguard_accessibility_user_selector">User selector</string> + <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] --> + <string name="keyguard_accessibility_status">Status</string> + <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] --> + <string name="keygaurd_accessibility_media_controls">Media controls</string> + <!-- Password keyboard strings. Used by LockScreen and Settings --><skip /> <!-- Label for "switch to symbols" key. Must be short to fit on key! --> <string name="password_keyboard_label_symbol_key">\?123</string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index eb2b5a677eac..281d92ade735 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -217,6 +217,7 @@ <java-symbol type="id" name="sms_short_code_detail_message" /> <java-symbol type="id" name="sms_short_code_remember_choice_checkbox" /> <java-symbol type="id" name="sms_short_code_remember_undo_instruction" /> + <java-symbol type="id" name="breadcrumb_section" /> <java-symbol type="attr" name="actionModeShareDrawable" /> <java-symbol type="attr" name="alertDialogCenterButtons" /> @@ -261,6 +262,7 @@ <java-symbol type="bool" name="config_ui_enableFadingMarquee" /> <java-symbol type="bool" name="config_use_strict_phone_number_comparation" /> <java-symbol type="bool" name="config_voice_capable" /> + <java-symbol type="bool" name="config_wifiDisplaySupportsProtectedBuffers" /> <java-symbol type="bool" name="preferences_prefer_dual_pane" /> <java-symbol type="bool" name="skip_restoring_network_selection" /> <java-symbol type="bool" name="split_action_bar_is_narrow" /> @@ -548,6 +550,10 @@ <java-symbol type="string" name="keyboardview_keycode_enter" /> <java-symbol type="string" name="keyboardview_keycode_mode_change" /> <java-symbol type="string" name="keyboardview_keycode_shift" /> + <java-symbol type="string" name="keygaurd_accessibility_media_controls" /> + <java-symbol type="string" name="keyguard_accessibility_status" /> + <java-symbol type="string" name="keyguard_accessibility_user_selector" /> + <java-symbol type="string" name="keyguard_accessibility_widget_changed" /> <java-symbol type="string" name="kilobyteShort" /> <java-symbol type="string" name="last_month" /> <java-symbol type="string" name="launchBrowserDefault" /> @@ -948,6 +954,7 @@ <java-symbol type="drawable" name="platlogo_alt" /> <java-symbol type="drawable" name="stat_notify_sync_error" /> <java-symbol type="drawable" name="stat_notify_wifi_in_range" /> + <java-symbol type="drawable" name="stat_notify_rssi_in_range" /> <java-symbol type="drawable" name="stat_sys_gps_on" /> <java-symbol type="drawable" name="stat_sys_tether_wifi" /> <java-symbol type="drawable" name="status_bar_background" /> @@ -1097,6 +1104,7 @@ <java-symbol type="xml" name="kg_password_kbd_numeric" /> <java-symbol type="xml" name="power_profile" /> <java-symbol type="xml" name="time_zones_by_country" /> + <java-symbol type="xml" name="sms_short_codes" /> <java-symbol type="raw" name="accessibility_gestures" /> <java-symbol type="raw" name="incognito_mode_start_page" /> @@ -1181,6 +1189,9 @@ <java-symbol type="bool" name="config_reverseDefaultRotation" /> <java-symbol type="bool" name="config_showNavigationBar" /> <java-symbol type="bool" name="target_honeycomb_needs_options_menu" /> + <java-symbol type="color" name="kg_multi_user_text_active" /> + <java-symbol type="color" name="kg_multi_user_text_inactive" /> + <java-symbol type="color" name="kg_widget_pager_gradient" /> <java-symbol type="dimen" name="navigation_bar_height" /> <java-symbol type="dimen" name="navigation_bar_height_landscape" /> <java-symbol type="dimen" name="navigation_bar_width" /> @@ -1206,8 +1217,6 @@ <java-symbol type="drawable" name="magnified_region_frame" /> <java-symbol type="drawable" name="menu_background" /> <java-symbol type="drawable" name="stat_sys_secure" /> - <java-symbol type="drawable" name="kg_widget_overscroll_layer_left" /> - <java-symbol type="drawable" name="kg_widget_overscroll_layer_right" /> <java-symbol type="id" name="action_mode_bar_stub" /> <java-symbol type="id" name="alarm_status" /> <java-symbol type="id" name="backspace" /> @@ -1291,6 +1300,7 @@ <java-symbol type="id" name="kg_widget_region" /> <java-symbol type="id" name="left_strip" /> <java-symbol type="id" name="right_strip" /> + <java-symbol type="id" name="keyguard_multi_user_selector" /> <java-symbol type="integer" name="config_carDockRotation" /> <java-symbol type="integer" name="config_defaultUiModeType" /> @@ -1330,6 +1340,8 @@ <java-symbol type="layout" name="screen_title" /> <java-symbol type="layout" name="screen_title_icons" /> <java-symbol type="layout" name="keyguard_host_view" /> + <java-symbol type="layout" name="keyguard_transport_control_view" /> + <java-symbol type="layout" name="keyguard_status_view" /> <java-symbol type="string" name="abbrev_wday_month_day_no_year" /> <java-symbol type="string" name="android_upgrading_title" /> <java-symbol type="string" name="bugreport_title" /> @@ -1399,7 +1411,6 @@ <java-symbol type="string" name="kg_password_wrong_pin_code" /> <java-symbol type="string" name="kg_invalid_sim_pin_hint" /> <java-symbol type="string" name="kg_invalid_sim_puk_hint" /> - <java-symbol type="string" name="kg_sim_puk_recovery_hint" /> <java-symbol type="string" name="kg_invalid_puk" /> <java-symbol type="string" name="kg_login_too_many_attempts" /> <java-symbol type="string" name="kg_login_instructions" /> diff --git a/core/res/res/xml/sms_short_codes.xml b/core/res/res/xml/sms_short_codes.xml new file mode 100644 index 000000000000..8b395af0a7b3 --- /dev/null +++ b/core/res/res/xml/sms_short_codes.xml @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 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. +*/ +--> + +<!-- Regex patterns for SMS short codes by country. --> +<shortcodes> + + <!-- The country attribute is the ISO country code of the user's account (from SIM card or NV). + The pattern attribute is a regex that matches all SMS short codes for the country. + The premium attribute is a regex that matches premium rate SMS short codes. + The free attribute matches short codes that we know will not cost the user, such as + emergency numbers. The standard attribute matches short codes that are billed at the + standard SMS rate. The user is warned when the destination phone number matches the + "pattern" or "premium" regexes, and does not match the "free" or "standard" regexes. --> + + <!-- Harmonised European Short Codes are 6 digit numbers starting with 116 (free helplines). + Premium patterns include short codes from: http://aonebill.com/coverage&tariffs + and http://mobilcent.com/info-worldwide.asp and extracted from: + http://smscoin.net/software/engine/WordPress/Paid+SMS-registration/ --> + + <!-- Albania: 5 digits, known short codes listed --> + <shortcode country="al" pattern="\\d{5}" premium="15191|55[56]00" /> + + <!-- Armenia: 3-4 digits, emergency numbers 10[123] --> + <shortcode country="am" pattern="\\d{3,4}" premium="11[2456]1|3024" free="10[123]" /> + + <!-- Austria: 10 digits, premium prefix 09xx, plus EU --> + <shortcode country="at" pattern="11\\d{4}" premium="09.*" free="116\\d{3}" /> + + <!-- Australia: 6 or 8 digits starting with "19" --> + <shortcode country="au" pattern="19(?:\\d{4}|\\d{6})" premium="19998882" /> + + <!-- Azerbaijan: 4-5 digits, known premium codes listed --> + <shortcode country="az" pattern="\\d{4,5}" premium="330[12]|87744|901[234]|93(?:94|101)|9426|9525" /> + + <!-- Belgium: 4 digits, plus EU: http://www.mobileweb.be/en/mobileweb/sms-numberplan.asp --> + <shortcode country="be" premium="\\d{4}" free="8\\d{3}|116\\d{3}" /> + + <!-- Bulgaria: 4-5 digits, plus EU --> + <shortcode country="bg" pattern="\\d{4,5}" premium="18(?:16|423)|19(?:1[56]|35)" free="116\\d{3}" /> + + <!-- Belarus: 4 digits --> + <shortcode country="by" pattern="\\d{4}" premium="3336|4161|444[4689]|501[34]|7781" /> + + <!-- Canada: 5-6 digits --> + <shortcode country="ca" pattern="\\d{5,6}" premium="60999|88188" /> + + <!-- Switzerland: 3-5 digits: http://www.swisscom.ch/fxres/kmu/thirdpartybusiness_code_of_conduct_en.pdf --> + <shortcode country="ch" pattern="[2-9]\\d{2,4}" premium="543|83111" /> + + <!-- China: premium shortcodes start with "1066", free shortcodes start with "1065": + http://clients.txtnation.com/entries/197192-china-premium-sms-short-code-requirements --> + <shortcode country="cn" premium="1066.*" free="1065.*" /> + + <!-- Cyprus: 4-6 digits (not confirmed), known premium codes listed, plus EU --> + <shortcode country="cy" pattern="\\d{4,6}" premium="7510" free="116\\d{3}" /> + + <!-- Czech Republic: 7-8 digits, starting with 9, plus EU: + http://www.o2.cz/osobni/en/services-by-alphabet/91670-premium_sms.html --> + <shortcode country="cz" premium="9\\d{6,7}" free="116\\d{3}" /> + + <!-- Germany: 4-5 digits plus 1232xxx (premium codes from http://www.vodafone.de/infofaxe/537.pdf and http://premiumdienste.eplus.de/pdf/kodex.pdf), plus EU. To keep the premium regex from being too large, it only includes payment processors that have been used by SMS malware, with the regular pattern matching the other premium short codes. --> + <shortcode country="de" pattern="\\d{4,5}|1232\\d{3}" premium="11(?:111|833)|1232(?:013|021|060|075|286|358)|118(?:44|80|86)|20[25]00|220(?:21|22|88|99)|221(?:14|21)|223(?:44|53|77)|224[13]0|225(?:20|59|90)|226(?:06|10|20|26|30|40|56|70)|227(?:07|33|39|66|76|78|79|88|99)|228(?:08|11|66|77)|23300|30030|3[12347]000|330(?:33|55|66)|33(?:233|331|366|533)|34(?:34|567)|37000|40(?:040|123|444|[3568]00)|41(?:010|414)|44(?:000|044|344|44[24]|544)|50005|50100|50123|50555|51000|52(?:255|783)|54(?:100|2542)|55(?:077|[24]00|222|333|55|[12369]55)|56(?:789|886)|60800|6[13]000|66(?:[12348]66|566|766|777|88|999)|68888|70(?:07|123|777)|76766|77(?:007|070|222|444|[567]77)|80(?:008|123|888)|82(?:002|[378]00|323|444|472|474|488|727)|83(?:005|[169]00|333|830)|84(?:141|300|32[34]|343|488|499|777|888)|85888|86(?:188|566|640|644|650|677|868|888)|870[24]9|871(?:23|[49]9)|872(?:1[0-8]|49|99)|87499|875(?:49|55|99)|876(?:0[1367]|1[1245678]|54|99)|877(?:00|99)|878(?:15|25|3[567]|8[12])|87999|880(?:08|44|55|77|99)|88688|888(?:03|10|8|89)|8899|90(?:009|999)|99999" free="116\\d{3}" /> + + <!-- Denmark: see http://iprs.webspacecommerce.com/Denmark-Premium-Rate-Numbers --> + <shortcode country="dk" pattern="\\d{4,5}" premium="1\\d{3}" free="116\\d{3}" /> + + <!-- Estonia: short codes 3-5 digits starting with 1, plus premium 7 digit numbers starting with 90, plus EU. + http://www.tja.ee/public/documents/Elektrooniline_side/Oigusaktid/ENG/Estonian_Numbering_Plan_annex_06_09_2010.mht --> + <shortcode country="ee" pattern="1\\d{2,4}" premium="90\\d{5}|15330|1701[0-3]" free="116\\d{3}" /> + + <!-- Spain: 5-6 digits: 25xxx, 27xxx, 280xx, 35xxx, 37xxx, 795xxx, 797xxx, 995xxx, 997xxx, plus EU. + http://www.legallink.es/?q=en/content/which-current-regulatory-status-premium-rate-services-spain --> + <shortcode country="es" premium="[23][57]\\d{3}|280\\d{2}|[79]9[57]\\d{3}" free="116\\d{3}" /> + + <!-- Finland: 5-6 digits, premium 0600, 0700: http://en.wikipedia.org/wiki/Telephone_numbers_in_Finland --> + <shortcode country="fi" pattern="\\d{5,6}" premium="0600.*|0700.*|171(?:59|63)" free="116\\d{3}" /> + + <!-- France: 5 digits, free: 3xxxx, premium [4-8]xxxx, plus EU: + http://clients.txtnation.com/entries/161972-france-premium-sms-short-code-requirements --> + <shortcode country="fr" premium="[4-8]\\d{4}" free="3\\d{4}|116\\d{3}" /> + + <!-- United Kingdom (Great Britain): 4-6 digits, common codes [5-8]xxxx, plus EU: + http://www.short-codes.com/media/Co-regulatoryCodeofPracticeforcommonshortcodes170206.pdf --> + <shortcode country="gb" pattern="\\d{4,6}" premium="[5-8]\\d{4}" free="116\\d{3}" /> + + <!-- Georgia: 4 digits, known premium codes listed --> + <shortcode country="ge" pattern="\\d{4}" premium="801[234]|888[239]" /> + + <!-- Greece: 5 digits (54xxx, 19yxx, x=0-9, y=0-5): http://www.cmtelecom.com/premium-sms/greece --> + <shortcode country="gr" pattern="\\d{5}" premium="54\\d{3}|19[0-5]\\d{2}" free="116\\d{3}" /> + + <!-- Hungary: 4 or 10 digits starting with 1 or 0, plus EU: + http://clients.txtnation.com/entries/209633-hungary-premium-sms-short-code-regulations --> + <shortcode country="hu" pattern="[01](?:\\d{3}|\\d{9})" premium="0691227910|1784" free="116\\d{3}" /> + + <!-- Ireland: 5 digits, 5xxxx (50xxx=free, 5[12]xxx=standard), plus EU: + http://www.comreg.ie/_fileupload/publications/ComReg1117.pdf --> + <shortcode country="ie" pattern="\\d{5}" premium="5[3-9]\\d{3}" free="50\\d{3}|116\\d{3}" standard="5[12]\\d{3}" /> + + <!-- Israel: 4 digits, known premium codes listed --> + <shortcode country="il" pattern="\\d{4}" premium="4422|4545" /> + + <!-- Italy: 5 digits (premium=4xxxx), plus EU: + http://clients.txtnation.com/attachments/token/di5kfblvubttvlw/?name=Italy_CASP_EN.pdf --> + <shortcode country="it" pattern="\\d{5}" premium="4\\d{4}" free="116\\d{3}" /> + + <!-- Kyrgyzstan: 4 digits, known premium codes listed --> + <shortcode country="kg" pattern="\\d{4}" premium="415[2367]|444[69]" /> + + <!-- Kazakhstan: 4 digits, known premium codes listed: http://smscoin.net/info/pricing-kazakhstan/ --> + <shortcode country="kz" pattern="\\d{4}" premium="335[02]|4161|444[469]|77[2359]0|8444|919[3-5]|968[2-5]" /> + + <!-- Lithuania: 3-5 digits, known premium codes listed, plus EU --> + <shortcode country="lt" pattern="\\d{3,5}" premium="13[89]1|1394|16[34]5" free="116\\d{3}" /> + + <!-- Luxembourg: 5 digits, 6xxxx, plus EU: + http://www.luxgsm.lu/assets/files/filepage/file_1253803400.pdf --> + <shortcode country="lu" premium="6\\d{4}" free="116\\d{3}" /> + + <!-- Latvia: 4 digits, known premium codes listed, plus EU --> + <shortcode country="lv" pattern="\\d{4}" premium="18(?:19|63|7[1-4])" free="116\\d{3}" /> + + <!-- Mexico: 4-5 digits (not confirmed), known premium codes listed --> + <shortcode country="mx" pattern="\\d{4,5}" premium="53035|7766" /> + + <!-- Malaysia: 5 digits: http://www.skmm.gov.my/attachment/Consumer_Regulation/Mobile_Content_Services_FAQs.pdf --> + <shortcode country="my" pattern="\\d{5}" premium="32298|33776" /> + + <!-- The Netherlands, 4 digits, known premium codes listed, plus EU --> + <shortcode country="nl" pattern="\\d{4}" premium="4466|5040" free="116\\d{3}" /> + + <!-- Norway: 4-5 digits (not confirmed), known premium codes listed --> + <shortcode country="no" pattern="\\d{4,5}" premium="2201|222[67]" /> + + <!-- New Zealand: 3-4 digits, known premium codes listed --> + <shortcode country="nz" pattern="\\d{3,4}" premium="3903|8995" /> + + <!-- Poland: 4-5 digits (not confirmed), known premium codes listed, plus EU --> + <shortcode country="pl" pattern="\\d{4,5}" premium="74240|79(?:10|866)|92525" free="116\\d{3}" /> + + <!-- Portugal: 5 digits, plus EU: + http://clients.txtnation.com/entries/158326-portugal-premium-sms-short-code-regulations --> + <shortcode country="pt" premium="6[1289]\\d{3}" free="116\\d{3}" /> + + <!-- Romania: 4 digits, plus EU: http://www.simplus.ro/en/resources/glossary-of-terms/ --> + <shortcode country="ro" pattern="\\d{4}" premium="12(?:63|66|88)|13(?:14|80)" free="116\\d{3}" /> + + <!-- Russia: 4 digits, known premium codes listed: http://smscoin.net/info/pricing-russia/ --> + <shortcode country="ru" pattern="\\d{4}" premium="1(?:1[56]1|899)|2(?:09[57]|322|47[46]|880|990)|3[589]33|4161|44(?:4[3-9]|81)|77(?:33|81)" /> + + <!-- Sweden: 5 digits (72xxx), plus EU: http://www.viatel.se/en/premium-sms/ --> + <shortcode country="se" premium="72\\d{3}" free="116\\d{3}" /> + + <!-- Singapore: 5 digits: http://clients.txtnation.com/entries/306442-singapore-premium-sms-short-code-requirements + Free government directory info at 74688: http://app.sgdi.gov.sg/sms_help.asp --> + <shortcode country="sg" pattern="7\\d{4}" premium="73800" standard="74688" /> + + <!-- Slovenia: 4 digits (premium=3xxx, 6xxx, 8xxx), plus EU: http://www.cmtelecom.com/premium-sms/slovenia --> + <shortcode country="si" pattern="\\d{4}" premium="[368]\\d{3}" free="116\\d{3}" /> + + <!-- Slovakia: 4 digits (premium), plus EU: http://www.cmtelecom.com/premium-sms/slovakia --> + <shortcode country="sk" premium="\\d{4}" free="116\\d{3}" /> + + <!-- Tajikistan: 4 digits, known premium codes listed --> + <shortcode country="tj" pattern="\\d{4}" premium="11[3-7]1|4161|4333|444[689]" /> + + <!-- Ukraine: 4 digits, known premium codes listed --> + <shortcode country="ua" pattern="\\d{4}" premium="444[3-9]|70[579]4|7540" /> + + <!-- USA: 5-6 digits (premium codes from https://www.premiumsmsrefunds.com/ShortCodes.htm) --> + <shortcode country="us" pattern="\\d{5,6}" premium="20433|21(?:344|472)|22715|23(?:333|847)|24(?:15|28)0|25209|27(?:449|606|663)|28498|305(?:00|83)|32(?:340|941)|33(?:166|786|849)|34746|35(?:182|564)|37975|38(?:135|146|254)|41(?:366|463)|42335|43(?:355|500)|44(?:578|711|811)|45814|46(?:157|173|327)|46666|47553|48(?:221|277|669)|50(?:844|920)|51(?:062|368)|52944|54(?:723|892)|55928|56483|57370|59(?:182|187|252|342)|60339|61(?:266|982)|62478|64(?:219|898)|65(?:108|500)|69(?:208|388)|70877|71851|72(?:078|087|465)|73(?:288|588|882|909|997)|74(?:034|332|815)|76426|79213|81946|83177|84(?:103|685)|85797|86(?:234|236|666)|89616|90(?:715|842|938)|91(?:362|958)|94719|95297|96(?:040|666|835|969)|97(?:142|294|688)|99(?:689|796|807)" /> + +</shortcodes> diff --git a/docs/html/design/building-blocks/buttons.jd b/docs/html/design/building-blocks/buttons.jd index 1c28cbefb117..82e2477c86be 100644 --- a/docs/html/design/building-blocks/buttons.jd +++ b/docs/html/design/building-blocks/buttons.jd @@ -36,3 +36,10 @@ use borderless buttons with both icons and text. Borderless buttons are visually than basic buttons and integrate nicely with other content.</p> <img src="{@docRoot}design/media/buttons_borderless.png"> + + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to build and customize buttons in your app, + see the <a href="{@docRoot}guide/topics/ui/controls/button.html">Buttons</a> API guide.</p> +</div> diff --git a/docs/html/design/building-blocks/dialogs.jd b/docs/html/design/building-blocks/dialogs.jd index 728821e21162..a2ece2ea5cce 100644 --- a/docs/html/design/building-blocks/dialogs.jd +++ b/docs/html/design/building-blocks/dialogs.jd @@ -122,6 +122,12 @@ available based on the title and the text of the action buttons.</p> </div> </div> +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to build dialogs in your app, + see the <a href="{@docRoot}guide/topics/ui/dialogs.html">Dialogs</a> API guide.</p> +</div> + <h2 id="popups">Popups</h2> <p>Popups are lightweight version of dialogs that require a single selection from the user. Popups @@ -150,3 +156,10 @@ continue editing later. Toasts automatically disappear after a timeout.</p> </div> </div> + + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to create toasts, + see the <a href="{@docRoot}guide/topics/ui/notifiers/toasts.html">Toasts</a> API guide.</p> +</div> diff --git a/docs/html/design/building-blocks/pickers.jd b/docs/html/design/building-blocks/pickers.jd index e3cf6424c7e3..b328df90548b 100644 --- a/docs/html/design/building-blocks/pickers.jd +++ b/docs/html/design/building-blocks/pickers.jd @@ -29,3 +29,10 @@ app helps ensure that a user's specification of a data or time input is valid an correctly. The format of a time and date picker adjusts automatically to the locale.</p> <img src="{@docRoot}design/media/picker_datetime.png"> + + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to create date and time pickers, + see the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a> API guide.</p> +</div> diff --git a/docs/html/design/building-blocks/spinners.jd b/docs/html/design/building-blocks/spinners.jd index 621a57ce7441..279565f88fa4 100644 --- a/docs/html/design/building-blocks/spinners.jd +++ b/docs/html/design/building-blocks/spinners.jd @@ -35,3 +35,10 @@ tabs.</p> <div class="figure-caption"> Spinners in the Holo Dark and Holo Light themes, in various states. </div> + + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to create spinners, + see the <a href="{@docRoot}guide/topics/ui/controls/spinner.html">Spinners</a> API guide.</p> +</div> diff --git a/docs/html/design/building-blocks/switches.jd b/docs/html/design/building-blocks/switches.jd index c4dfc4bdeb9f..d9cfd07fd379 100644 --- a/docs/html/design/building-blocks/switches.jd +++ b/docs/html/design/building-blocks/switches.jd @@ -23,3 +23,11 @@ consider a spinner, which uses less space.</p> <p>On/off switches toggle the state of a single settings option.</p> <img src="{@docRoot}design/media/switches_switches.png"> + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to create these different switches, + see the <a href="{@docRoot}guide/topics/ui/controls/checkbox.html">Checkboxes</a>, + <a href="{@docRoot}guide/topics/ui/controls/radiobutton.html">Radio Buttons</a>, or + <a href="{@docRoot}guide/topics/ui/controls/togglebutton.html">Toggle Buttons</a> API guides.</p> +</div> diff --git a/docs/html/design/building-blocks/tabs.jd b/docs/html/design/building-blocks/tabs.jd index fe05f80a6272..0a0f9077981b 100644 --- a/docs/html/design/building-blocks/tabs.jd +++ b/docs/html/design/building-blocks/tabs.jd @@ -57,3 +57,10 @@ to the next/previous view, swipe left or right.</p> permits fast view switching even on narrower screens.</p> <img src="{@docRoot}design/media/tabs_stacked.png"> + + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to create tabs, + see the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> API guide.</p> +</div> diff --git a/docs/html/design/building-blocks/text-fields.jd b/docs/html/design/building-blocks/text-fields.jd index 1b10420db4f3..563f2475ae4e 100644 --- a/docs/html/design/building-blocks/text-fields.jd +++ b/docs/html/design/building-blocks/text-fields.jd @@ -68,3 +68,11 @@ Selection mode includes:</p> </div> </div> + + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to create text fields, provide auto-complete suggestions, + and specify the input mode, + see the <a href="{@docRoot}guide/topics/ui/controls/text.html">Text Fields</a> API guide.</p> +</div> diff --git a/docs/html/design/downloads/index.jd b/docs/html/design/downloads/index.jd index 5f78aeaeaa67..00f44677d8dd 100644 --- a/docs/html/design/downloads/index.jd +++ b/docs/html/design/downloads/index.jd @@ -12,7 +12,8 @@ You can also download individual files listed below.</p> <div class="layout-content-col span-4"> <p> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Downloads_20120823.zip">Download All</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'All Design Assets']);" + href="{@docRoot}downloads/design/Android_Design_Downloads_20120823.zip">Download All</a> </p> </div> @@ -37,10 +38,14 @@ available.</p> <div class="layout-content-col span-4"> <p> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Fireworks_Stencil_20120814.png">Adobe® Fireworks® PNG Stencil</a> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Illustrator_Vectors_20120814.ai">Adobe® Illustrator® Stencil</a> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_OmniGraffle_Stencil_20120814.graffle">Omni® OmniGraffle® Stencil</a> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Holo_Widgets_20120814.zip">Adobe® Photoshop® Sources</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Fireworks Stencil']);" + href="{@docRoot}downloads/design/Android_Design_Fireworks_Stencil_20120814.png">Adobe® Fireworks® PNG Stencil</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Illustrator Stencil']);" + href="{@docRoot}downloads/design/Android_Design_Illustrator_Vectors_20120814.ai">Adobe® Illustrator® Stencil</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'OmniGraffle Stencil']);" + href="{@docRoot}downloads/design/Android_Design_OmniGraffle_Stencil_20120814.graffle">Omni® OmniGraffle® Stencil</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Photoshop Sources']);" + href="{@docRoot}downloads/design/Android_Design_Holo_Widgets_20120814.zip">Adobe® Photoshop® Sources</a> </p> </div> @@ -66,7 +71,8 @@ modify to match your theme, plus source files.</p> <div class="layout-content-col span-4"> <p> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Action Bar Icon Pack</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Action Bar Icons']);" + href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Action Bar Icon Pack</a> </p> </div> @@ -91,8 +97,10 @@ requirements of UI and high-resolution screens.</p> <div class="layout-content-col span-4"> <p> - <a class="download-button" href="{@docRoot}downloads/design/Roboto_Hinted_20120823.zip">Roboto</a> - <a class="download-button" href="{@docRoot}downloads/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Roboto ZIP']);" + href="{@docRoot}downloads/design/Roboto_Hinted_20120823.zip">Roboto</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Roboto Specemin Book']);" + href="{@docRoot}downloads/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a> </p> </div> @@ -115,7 +123,8 @@ shade that can be used as a complement when needed.</p> <div class="layout-content-col span-4"> <p> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Color_Swatches_20120229.zip">Color Swatches</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Color Swatches']);" + href="{@docRoot}downloads/design/Android_Design_Color_Swatches_20120229.zip">Color Swatches</a> </p> </div> diff --git a/docs/html/design/patterns/accessibility.jd b/docs/html/design/patterns/accessibility.jd index b2fbda97c9d7..2c3333f4d6ac 100644 --- a/docs/html/design/patterns/accessibility.jd +++ b/docs/html/design/patterns/accessibility.jd @@ -69,6 +69,15 @@ page.title=Accessibility <h4>Try it out yourself</h4> <p>Turn on the TalkBack service in <strong>Settings > Accessibility</strong> and navigate your application using directional controls or eyes-free navigation.</p> + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to properly implement accessibility in your app, see the + <a href="{@docRoot}guide/topics/ui/accessibility/index.html">Accessibility</a> + API guide.</p> +</div> + + <h2>Checklist</h2> <ul> <li>Make navigation intuitive</li> diff --git a/docs/html/design/patterns/actionbar.jd b/docs/html/design/patterns/actionbar.jd index ba5b4002a8c4..265ccde1bc6d 100644 --- a/docs/html/design/patterns/actionbar.jd +++ b/docs/html/design/patterns/actionbar.jd @@ -293,7 +293,8 @@ files for further customization. </p> <p> -<a href="{@docRoot}downloads/design/Android_Design_Icons_20120229.zip">Download the Action Bar Icon Pack</a> +<a onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Action Bar Icons (@actionbar page)']);" + href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Download the Action Bar Icon Pack</a> </p> @@ -348,6 +349,17 @@ sharing options.</p> The Gallery app's share action provider with extended spinner for additional sharing options. </div> + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to build an action bar + see the <a href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> API guide. + For information about contextual action bars, read + <a href="{@docRoot}guide/topics/ui/menus.html#context-menu">Creating Contextual Menus</a>. + </p> +</div> + + <h2 id="checklist">Action Bar Checklist</h2> <p>When planning your split action bars, ask yourself questions like these:</p> diff --git a/docs/html/design/patterns/multi-pane-layouts.jd b/docs/html/design/patterns/multi-pane-layouts.jd index ad888e9bc0fe..e607676152e0 100644 --- a/docs/html/design/patterns/multi-pane-layouts.jd +++ b/docs/html/design/patterns/multi-pane-layouts.jd @@ -86,6 +86,18 @@ you can use to adjust the layout after orientation change while keeping function </div> </div> + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to create multi-pane layouts, read + see the <a href="{@docRoot}training/basics/fragments/index.html">Building + a Dynamic UI with Fragments</a> and + <a href="{@docRoot}training/multiscreen/index.html">Designing for Multiple Screens</a>. + </p> +</div> + + + <h2 id="checklist">Checklist</h2> <ul> diff --git a/docs/html/design/patterns/navigation.jd b/docs/html/design/patterns/navigation.jd index 7e288aeaad5b..656e6e5338fa 100644 --- a/docs/html/design/patterns/navigation.jd +++ b/docs/html/design/patterns/navigation.jd @@ -202,3 +202,15 @@ with Task B—the prior context is abandoned in favor of the user's new goal <p>When your app registers to handle intents with an activity deep within the app's hierarchy, refer to <a href="#into-your-app">Navigation into Your App via Home Screen Widgets and Notifications</a> for guidance on how to specify Up navigation.</p> + + + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to build your app with proper Up and Back navigation, read + <a href="{@docRoot}training/implementing-navigation/ancestral.html">Implementing + Ancestral Navigation</a> and + <a href="{@docRoot}training/implementing-navigation/temporal.html">Implementing + Temporal Navigation</a>, respectively. + </p> +</div> diff --git a/docs/html/design/patterns/notifications.jd b/docs/html/design/patterns/notifications.jd index 75bfff290fc0..1a15a648aeba 100644 --- a/docs/html/design/patterns/notifications.jd +++ b/docs/html/design/patterns/notifications.jd @@ -250,4 +250,13 @@ develop a widget that they can choose to place on their home screen.</p> <h4>Dialogs and toasts are for feedback not notification</h4> <p>Your app should not create a dialog or toast if it is not currently on screen. Dialogs and Toasts should only be displayed as the immediate response to the user taking an action inside of your app. For further guidance on the use of dialogs and toasts, refer to <a href="{@docRoot}design/patterns/confirming-acknowledging.html">Confirming & Acknowledging</a>.</p> </div> -</div>
\ No newline at end of file +</div> + + + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to build notifications, see the + <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">Notifications</a> + API guide.</p> +</div> diff --git a/docs/html/design/patterns/settings.jd b/docs/html/design/patterns/settings.jd index d10f0d3e6eeb..fef7585ac7de 100644 --- a/docs/html/design/patterns/settings.jd +++ b/docs/html/design/patterns/settings.jd @@ -679,6 +679,15 @@ it doesn't mean anything to most users and would have taken up a lot of space.</ </div> </div> + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to build a settings interface, see the + <a href="{@docRoot}guide/topics/ui/settings.html">Settings</a> + API guide.</p> +</div> + + <h2 id="checklist">Checklist</h2> <ul> <li><p>Make sure each item in Settings meets the criteria for belonging there.</p></li> diff --git a/docs/html/design/patterns/swipe-views.jd b/docs/html/design/patterns/swipe-views.jd index 252343da8e22..daddd31e4730 100644 --- a/docs/html/design/patterns/swipe-views.jd +++ b/docs/html/design/patterns/swipe-views.jd @@ -77,3 +77,13 @@ using the swipe gesture to navigate to the next/previous detail view.</p> </ul> </div> </div> + + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to create swipe views, read + <a href="{@docRoot}training/implementing-navigation/lateral.html">Implementing Lateral Navigation</a>. + </p> +</div> + + diff --git a/docs/html/design/patterns/widgets.jd b/docs/html/design/patterns/widgets.jd index cf4c74f990e0..54726b1b530b 100644 --- a/docs/html/design/patterns/widgets.jd +++ b/docs/html/design/patterns/widgets.jd @@ -122,7 +122,15 @@ A music player widget is primarily a control widget, but also keeps the user inf </div> </div> -<h3>Checklist</h3> + +<div class="note develop"> +<p><strong>Developer Guide</strong></p> + <p>For information about how to build widgets for the home screen, see the + <a href="{@docRoot}guide/topics/appwidgets/index.html">App Widgets</a> + API guide.</p> +</div> + +<h2>Checklist</h2> <ul> <li>Focus on small portions of glanceable information on your widget. Expand on the information in your app.</li> <li>Choose the right widget type for your purpose.</li> diff --git a/docs/html/design/style/color.jd b/docs/html/design/style/color.jd index 5be34ac5f64d..a7daacf50e27 100644 --- a/docs/html/design/style/color.jd +++ b/docs/html/design/style/color.jd @@ -115,7 +115,8 @@ between visual components. Note that red and green may be indistinguishable to c <p>Blue is the standard accent color in Android's color palette. Each color has a corresponding darker shade that can be used as a complement when needed.</p> -<p><a href="{@docRoot}downloads/design/Android_Design_Color_Swatches_20120229.zip">Download the swatches</a></p> +<p><a onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Color Swatches (@color page)']);" + href="{@docRoot}downloads/design/Android_Design_Color_Swatches_20120229.zip">Download the swatches</a></p> <img src="{@docRoot}design/media/color_spectrum.png"> diff --git a/docs/html/design/style/iconography.jd b/docs/html/design/style/iconography.jd index 3ba3f71bd269..ce11cf7fb3ca 100644 --- a/docs/html/design/style/iconography.jd +++ b/docs/html/design/style/iconography.jd @@ -109,7 +109,8 @@ files for further customization. </p> <p> -<a href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Download the Action Bar Icon Pack</a> +<a onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Action Bar Icons (@iconography page)']);" + href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Download the Action Bar Icon Pack</a> </p> <div class="layout-content-row"> diff --git a/docs/html/design/style/typography.jd b/docs/html/design/style/typography.jd index a699bed88b32..427b8c6fd226 100644 --- a/docs/html/design/style/typography.jd +++ b/docs/html/design/style/typography.jd @@ -18,8 +18,10 @@ italic weights by default.</p> <img src="{@docRoot}design/media/typography_alphas.png"> -<p><a href="{@docRoot}downloads/design/Roboto_Hinted_20111129.zip">Download Roboto</a></p> -<p><a href="{@docRoot}downloads/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a></p> +<p><a onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Roboto ZIP (@typography page)']);" + href="{@docRoot}downloads/design/Roboto_Hinted_20120823.zip">Download Roboto</a></p> +<p><a onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Roboto Specimen Booke (@typography page)']);" + href="{@docRoot}downloads/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a></p> </div> </div> diff --git a/docs/html/distribute/googleplay/promote/badges.jd b/docs/html/distribute/googleplay/promote/badges.jd index d6f15fb12cb4..90e8c0d6f099 100644 --- a/docs/html/distribute/googleplay/promote/badges.jd +++ b/docs/html/distribute/googleplay/promote/badges.jd @@ -88,6 +88,9 @@ function buildButton(form) { $("#button-preview").html(linkStart + "apps/details?id=" + form["package"].value + imageStart + altText + imageSrc + selectedValue + imageEnd); + + // Send the event to Analytics + _gaq.push(['_trackEvent', 'Distribute', 'Create Google Play Badge', 'Package ' + selectedValue]); } else if (form["publisher"].value != "Example, Inc.") { $("#preview").show(); $("#snippet").show().html(linkStartCode + "search?q=pub:" + form["publisher"].value @@ -96,6 +99,9 @@ function buildButton(form) { $("#button-preview").html(linkStart + "search?q=pub:" + form["publisher"].value + imageStart + altText + imageSrc + selectedValue + imageEnd); + + // Send the event to Analytics + _gaq.push(['_trackEvent', 'Distribute', 'Create Google Play Badge', 'Publisher ' + selectedValue]); } else { alert("Please enter your package name or publisher name"); } @@ -199,8 +205,8 @@ alt="Get it on Google Play (small)" /></label> alt="Get it on Google Play (large)" /></label> </div> - <input type="button" onclick="return buildButton(this.parentNode)" value="Build my badge" -style="padding:10px" /> + <input onclick="return buildButton(this.parentNode);" + type="button" value="Build my badge" style="padding:10px" /> <br/> </form> diff --git a/docs/html/distribute/promote/device-art.jd b/docs/html/distribute/promote/device-art.jd index af36625f8c73..93f772a5cdd3 100644 --- a/docs/html/distribute/promote/device-art.jd +++ b/docs/html/distribute/promote/device-art.jd @@ -299,6 +299,8 @@ feature image or screenshots for your Google Play app listing.</p> g_currentFilename = data.name; g_currentImage = img; createFrame(); + // Send the event to Analytics + _gaq.push(['_trackEvent', 'Distribute', 'Create Device Art', g_currentDevice.title]); }); }); }); diff --git a/docs/html/guide/topics/data/data-storage.jd b/docs/html/guide/topics/data/data-storage.jd index e9d2d25eefb7..2603a06186ff 100644 --- a/docs/html/guide/topics/data/data-storage.jd +++ b/docs/html/guide/topics/data/data-storage.jd @@ -232,7 +232,12 @@ save files. This can be a removable storage media (such as an SD card) or an int (non-removable) storage. Files saved to the external storage are world-readable and can be modified by the user when they enable USB mass storage to transfer files on a computer.</p> -<p class="caution"><strong>Caution:</strong> External files can disappear if the user mounts the +<p>It's possible that a device using a partition of the +internal storage for the external storage may also offer an SD card slot. In this case, +the SD card is <em>not</em> part of the external storage and your app cannot access it (the extra +storage is intended only for user-provided media that the system scans).</p> + +<p class="caution"><strong>Caution:</strong> External storage can become unavailable if the user mounts the external storage on a computer or removes the media, and there's no security enforced upon files you save to the external storage. All applications can read and write files placed on the external storage and the user can remove them.</p> diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd index d1c24dfbbe10..62c054aeede8 100644 --- a/docs/html/guide/topics/ui/dialogs.jd +++ b/docs/html/guide/topics/ui/dialogs.jd @@ -1,680 +1,806 @@ page.title=Dialogs -parent.title=User Interface -parent.link=index.html @jd:body + + <div id="qv-wrapper"> <div id="qv"> <h2>In this document</h2> +<ol> + <li><a href="#DialogFragment">Creating a Dialog Fragment</a></li> + <li><a href="#AlertDialog">Building an Alert Dialog</a> <ol> - <li><a href="#ShowingADialog">Showing a Dialog</a></li> - <li><a href="#DismissingADialog">Dismissing a Dialog</a></li> - <li><a href="#AlertDialog">Creating an AlertDialog</a> - <ol> - <li><a href="#AddingButtons">Adding buttons</a></li> - <li><a href="#AddingAList">Adding a list</a></li> - </ol> - </li> - <li><a href="#ProgressDialog">Creating a ProgressDialog</a> - <ol> - <li><a href="#ShowingAProgressBar">Showing a progress bar</a></li> - </ol> - </li> - <li><a href="#CustomDialog">Creating a Custom Dialog</a></li> + <li><a href="#AddingButtons">Adding buttons</a></li> + <li><a href="#AddingAList">Adding a list</a></li> + <li><a href="#CustomLayout">Creating a Custom Layout</a></li> </ol> - - <h2>Key classes</h2> + </li> + <li><a href="#PassingEvents">Passing Events Back to the Dialog's Host</a></li> + <li><a href="#ShowingADialog">Showing a Dialog</a></li> + <li><a href="#FullscreenDialog">Showing a Dialog Fullscreen or as an Embedded Fragment</a> <ol> - <li>{@link android.app.Dialog}</li> - <li>{@link android.app.AlertDialog}</li> - <li>{@link android.app.DialogFragment}</li> + <li><a href="#ActivityAsDialog">Showing an activity as a dialog on large screens</a></li> </ol> + </li> + <li><a href="#DismissingADialog">Dismissing a Dialog</a></li> +</ol> - <h2>Related tutorials</h2> + <h2>Key classes</h2> <ol> - <li><a href="{@docRoot}resources/tutorials/views/hello-datepicker.html">Hello -DatePicker</a></li> - <li><a href="{@docRoot}resources/tutorials/views/hello-timepicker.html">Hello -TimePicker</a></li> + <li>{@link android.app.DialogFragment}</li> + <li>{@link android.app.AlertDialog}</li> </ol> <h2>See also</h2> <ol> - <li><a href="{@docRoot}design/building-blocks/dialogs.html">Android Design: Dialogs</a></li> + <li><a href="{@docRoot}design/building-blocks/dialogs.html">Dialogs design guide</a></li> + <li><a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a> (Date/Time dialogs)</li> </ol> </div> </div> -<p>A dialog is usually a small window that appears in front of the current Activity. -The underlying Activity loses focus and the dialog accepts all user interaction. Dialogs are -normally used for notifications that should interrupt the user and to perform short tasks that -directly relate to the application in progress (such as a progress bar or a login prompt).</p> - -<p>The {@link android.app.Dialog} class is the base class for creating dialogs. However, you -typically should not instantiate a {@link android.app.Dialog} directly. Instead, you should use one -of the following subclasses:</p> -<dl> - <dt>{@link android.app.AlertDialog}</dt> - <dd>A dialog that can manage zero, one, two, or three buttons, and/or a list of - selectable items that can include checkboxes or radio buttons. The AlertDialog - is capable of constructing most dialog user interfaces and is the suggested dialog type. - See <a href="#AlertDialog">Creating an AlertDialog</a> below.</dd> - <dt>{@link android.app.ProgressDialog}</dt> - <dd>A dialog that displays a progress wheel or progress bar. Because it's an extension of - the AlertDialog, it also supports buttons. - See <a href="#ProgressDialog">Creating a ProgressDialog</a> below.</dd> - <dt>{@link android.app.DatePickerDialog}</dt> - <dd>A dialog that allows the user to select a date. See the - <a href="{@docRoot}resources/tutorials/views/hello-datepicker.html">Hello DatePicker</a> tutorial.</dd> - <dt>{@link android.app.TimePickerDialog}</dt> - <dd>A dialog that allows the user to select a time. See the - <a href="{@docRoot}resources/tutorials/views/hello-timepicker.html">Hello TimePicker</a> tutorial.</dd> -</dl> - -<p>If you would like to customize your own dialog, you can extend the -base {@link android.app.Dialog} object or any of the subclasses listed above and define a new layout. -See the section on <a href="#CustomDialog">Creating a Custom Dialog</a> below.</p> +<p>A dialog is a small window that prompts the user to +make a decision or enter additional information. A dialog does not fill the screen and is +normally used for modal events that require users to take an action before they can proceed.</p> <div class="note design"> <p><strong>Dialog Design</strong></p> - <p>For design guidelines, read Android Design's <a -href="{@docRoot}design/building-blocks/dialogs.html">Dialogs</a> guide.</p> + <p>For information about how to design your dialogs, including recommendations + for language, read the <a +href="{@docRoot}design/building-blocks/dialogs.html">Dialogs</a> design guide.</p> </div> +<img src="{@docRoot}images/ui/dialogs.png" /> +<p>The {@link android.app.Dialog} class is the base class for dialogs, but you +should avoid instantiating {@link android.app.Dialog} directly. +Instead, use one of the following subclasses:</p> +<dl> + <dt>{@link android.app.AlertDialog}</dt> + <dd>A dialog that can show a title, up to three buttons, a list of + selectable items, or a custom layout.</dd> + <dt>{@link android.app.DatePickerDialog} or {@link android.app.TimePickerDialog}</dt> + <dd>A dialog with a pre-defined UI that allows the user to select a date or time.</dd> +</dl> -<h2 id="ShowingADialog">Showing a Dialog</h2> +<div class="sidebox"> +<h2>Avoid ProgressDialog</h2> +<p>Android includes another dialog class called +{@link android.app.ProgressDialog} that shows a dialog with a progress bar. However, if you +need to indicate loading or indeterminate progress, you should instead follow the design +guidelines for <a href="{@docRoot}design/building-blocks/progress.html">Progress & +Activity</a> and use a {@link android.widget.ProgressBar} in your layout.</p> +</div> -<p>A dialog is always created and displayed as a part of an {@link android.app.Activity}. -You should normally create dialogs from within your Activity's -{@link android.app.Activity#onCreateDialog(int)} callback method. -When you use this callback, the Android system automatically manages the state of -each dialog and hooks them to the Activity, effectively making it the "owner" of each dialog. -As such, each dialog inherits certain properties from the Activity. For example, when a dialog -is open, the Menu key reveals the options menu defined for the Activity and the volume -keys modify the audio stream used by the Activity.</p> - -<p class="note"><strong>Note:</strong> If you decide to create a dialog outside of the -<code>onCreateDialog()</code> method, it will not be attached to an Activity. You can, however, -attach it to an Activity with {@link android.app.Dialog#setOwnerActivity(Activity)}.</p> - -<p>When you want to show a dialog, call -{@link android.app.Activity#showDialog(int)} and pass it an integer that uniquely identifies the -dialog that you want to display.</p> - -<p>When a dialog is requested for the first time, Android calls -{@link android.app.Activity#onCreateDialog(int)} from your Activity, which is -where you should instantiate the {@link android.app.Dialog}. This callback method -is passed the same ID that you passed to {@link android.app.Activity#showDialog(int)}. -After you create the Dialog, return the object at the end of the method.</p> - -<p>Before the dialog is displayed, Android also calls the optional callback method -{@link android.app.Activity#onPrepareDialog(int,Dialog)}. Define this method if you want to change -any properties of the dialog each time it is opened. This method is called -every time a dialog is opened, whereas {@link android.app.Activity#onCreateDialog(int)} is only -called the very first time a dialog is opened. If you don't define -{@link android.app.Activity#onPrepareDialog(int,Dialog) onPrepareDialog()}, then the dialog will -remain the same as it was the previous time it was opened. This method is also passed the dialog's -ID, along with the Dialog object you created in {@link android.app.Activity#onCreateDialog(int) -onCreateDialog()}.</p> - -<p>The best way to define the {@link android.app.Activity#onCreateDialog(int)} and -{@link android.app.Activity#onPrepareDialog(int,Dialog)} callback methods is with a -<em>switch</em> statement that checks the <var>id</var> parameter that's passed into the method. -Each <em>case</em> should check for a unique dialog ID and then create and define the respective Dialog. -For example, imagine a game that uses two different dialogs: one to indicate that the game -has paused and another to indicate that the game is over. First, define an integer ID for -each dialog:</p> -<pre> -static final int DIALOG_PAUSED_ID = 0; -static final int DIALOG_GAMEOVER_ID = 1; -</pre> +<p>These classes define the style and structure for your dialog, but you should +use a {@link android.support.v4.app.DialogFragment} as a container for your dialog. +The {@link android.support.v4.app.DialogFragment} class provides all the controls you +need to create your dialog and manage its appearance, instead of calling methods +on the {@link android.app.Dialog} object.</p> + +<p>Using {@link android.support.v4.app.DialogFragment} to manage the dialog +ensures that it correctly handles lifecycle events +such as when the user presses the <em>Back</em> button or rotates the screen. The {@link +android.support.v4.app.DialogFragment} class also allows you to reuse the dialog's UI as an +embeddable component in a larger UI, just like a traditional {@link +android.support.v4.app.Fragment} (such as when you want the dialog UI to appear differently +on large and small screens).</p> + +<p>The following sections in this guide describe how to use a {@link +android.support.v4.app.DialogFragment} in combination with an {@link android.app.AlertDialog} +object. If you'd like to create a date or time picker, you should instead read the +<a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a> guide.</p> + +<p class="note"><strong>Note:</strong> +Because the {@link android.app.DialogFragment} class was originally added with +Android 3.0 (API level 11), this document describes how to use the {@link +android.support.v4.app.DialogFragment} class that's provided with the <a +href="{@docRoot}tools/extras/support-library.html">Support Library</a>. By adding this library +to your app, you can use {@link android.support.v4.app.DialogFragment} and a variety of other +APIs on devices running Android 1.6 or higher. If the minimum version your app supports +is API level 11 or higher, then you can use the framework version of {@link +android.app.DialogFragment}, but be aware that the links in this document are for the support +library APIs. When using the support library, +be sure that you import <code>android.support.v4.app.DialogFragment</code> +class and <em>not</em> <code>android.app.DialogFragment</code>.</p> + + +<h2 id="DialogFragment">Creating a Dialog Fragment</h2> + +<p>You can accomplish a wide variety of dialog designs—including +custom layouts and those described in the <a +href="{@docRoot}design/building-blocks/dialogs.html">Dialogs</a> +design guide—by extending +{@link android.support.v4.app.DialogFragment} and creating a {@link android.app.AlertDialog} +in the {@link android.support.v4.app.DialogFragment#onCreateDialog +onCreateDialog()} callback method.</p> + +<p>For example, here's a basic {@link android.app.AlertDialog} that's managed within +a {@link android.support.v4.app.DialogFragment}:</p> -<p>Then, define the {@link android.app.Activity#onCreateDialog(int)} callback with a -switch case for each ID:</p> <pre> -protected Dialog onCreateDialog(int id) { - Dialog dialog; - switch(id) { - case DIALOG_PAUSED_ID: - // do the work to define the pause Dialog - break; - case DIALOG_GAMEOVER_ID: - // do the work to define the game over Dialog - break; - default: - dialog = null; +public class FireMissilesDialog extends DialogFragment { + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + // Use the Builder class for convenient dialog construction + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setMessage(R.string.dialog_fire_missiles) + .setPositiveButton(R.string.fire, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // FIRE ZE MISSILES! + } + }) + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // User cancelled the dialog + } + }); + // Create the AlertDialog object and return it + return builder.create(); } - return dialog; } </pre> -<p class="note"><strong>Note:</strong> In this example, there's no code inside -the case statements because the procedure for defining your Dialog is outside the scope -of this section. See the section below about <a href="#AlertDialog">Creating an AlertDialog</a>, -offers code suitable for this example.</p> +<div class="figure" style="width:290px;margin:0 0 0 20px"> +<img src="{@docRoot}images/ui/dialog_buttons.png" alt="" /> +<p class="img-caption"><strong>Figure 1.</strong> +A dialog with a message and two action buttons.</p> +</div> -<p>When it's time to show one of the dialogs, call {@link android.app.Activity#showDialog(int)} -with the ID of a dialog:</p> -<pre> -showDialog(DIALOG_PAUSED_ID); -</pre> +<p>Now, when you create an instance of this class and call {@link +android.support.v4.app.DialogFragment#show show()} on that object, the dialog appears as +shown in figure 1.</p> +<p>The next section describes more about using the {@link android.app.AlertDialog.Builder} +APIs to create the dialog.</p> -<h2 id="DismissingADialog">Dismissing a Dialog</h2> +<p>Depending on how complex your dialog is, you can implement a variety of other callback +methods in the {@link android.support.v4.app.DialogFragment}, including all the basic +<a href="{@docRoot}guide/components/fragments.html#Lifecycle">fragment lifecycle methods</a>. -<p>When you're ready to close your dialog, you can dismiss it by calling -{@link android.app.Dialog#dismiss()} on the Dialog object. -If necessary, you can also call {@link android.app.Activity#dismissDialog(int)} from the -Activity, which effectively calls {@link android.app.Dialog#dismiss()} on the -Dialog for you.</p> - -<p>If you are using {@link android.app.Activity#onCreateDialog(int)} to manage the state -of your dialogs (as discussed in the previous section), then every time your dialog is -dismissed, the state of the Dialog -object is retained by the Activity. If you decide that you will no longer need this object or -it's important that the state is cleared, then you should call -{@link android.app.Activity#removeDialog(int)}. This will remove any internal references -to the object and if the dialog is showing, it will dismiss it.</p> - -<h3>Using dismiss listeners</h3> - -<p>If you'd like your application to perform some procedures the moment that a dialog is dismissed, -then you should attach an on-dismiss listener to your Dialog.</p> - -<p>First define the {@link android.content.DialogInterface.OnDismissListener} interface. -This interface has just one method, -{@link android.content.DialogInterface.OnDismissListener#onDismiss(DialogInterface)}, which -will be called when the dialog is dismissed. -Then simply pass your OnDismissListener implementation to -{@link android.app.Dialog#setOnDismissListener(DialogInterface.OnDismissListener) -setOnDismissListener()}.</p> - -<p>However, note that dialogs can also be "cancelled." This is a special case that indicates -the dialog was explicitly cancelled by the user. This will occur if the user presses the -"back" button to close the dialog, or if the dialog explicitly calls {@link android.app.Dialog#cancel()} -(perhaps from a "Cancel" button in the dialog). When a dialog is cancelled, -the OnDismissListener will still be notified, but if you'd like to be informed that the dialog -was explicitly cancelled (and not dismissed normally), then you should register -an {@link android.content.DialogInterface.OnCancelListener} with -{@link android.app.Dialog#setOnCancelListener(DialogInterface.OnCancelListener) -setOnCancelListener()}.</p> - - -<h2 id="AlertDialog">Creating an AlertDialog</h2> - -<p>An {@link android.app.AlertDialog} is an extension of the {@link android.app.Dialog} -class. It is capable of constructing most dialog user interfaces and is the suggested dialog type. -You should use it for dialogs that use any of the following features:</p> -<ul> - <li>A title</li> - <li>A text message</li> - <li>One, two, or three buttons</li> - <li>A list of selectable items (with optional checkboxes or radio buttons)</li> -</ul> -<p>To create an AlertDialog, use the {@link android.app.AlertDialog.Builder} subclass. -Get a Builder with {@link android.app.AlertDialog.Builder#AlertDialog.Builder(Context)} and -then use the class's public methods to define all of the -AlertDialog properties. After you're done with the Builder, retrieve the -AlertDialog object with {@link android.app.AlertDialog.Builder#create()}.</p> -<p>The following topics show how to define various properties of the AlertDialog using the -AlertDialog.Builder class. If you use any of the following sample code inside your -{@link android.app.Activity#onCreateDialog(int) onCreateDialog()} callback method, -you can return the resulting Dialog object to display the dialog.</p> -<h3 id="AddingButtons">Adding buttons</h3> +<h2 id="AlertDialog">Building an Alert Dialog</h2> + + +<p>The {@link android.app.AlertDialog} class allows you to build a variety of dialog designs and +is often the only dialog class you'll need. +As shown in figure 2, there are three regions of an alert dialog:</p> + +<div class="figure" style="width:311px;margin-top:0"> +<img src="{@docRoot}images/ui/dialogs_regions.png" alt="" style="margin-bottom:0"/> +<p class="img-caption"><strong>Figure 2.</strong> The layout of a dialog.</p> +</div> -<img src="{@docRoot}images/dialog_buttons.png" alt="" style="float:right" /> +<ol> +<li><b>Title</b> + <p>This is optional and should be used only when the content area + is occupied by a detailed message, a list, or custom layout. If you need to state + a simple message or question (such as the dialog in figure 1), you don't need a title.</li> +<li><b>Content area</b> + <p>This can display a message, a list, or other custom layout.</p></li> +<li><b>Action buttons</b> + <p>There should be no more than three action buttons in a dialog.</p></li> +</ol> -<p>To create an AlertDialog with side-by-side buttons like the one shown in the screenshot to the right, -use the <code>set...Button()</code> methods:</p> +<p>The {@link android.app.AlertDialog.Builder} +class provides APIs that allow you to create an {@link android.app.AlertDialog} +with these kinds of content, including a custom layout.</p> + +<p>To build an {@link android.app.AlertDialog}:</p> <pre> -AlertDialog.Builder builder = new AlertDialog.Builder(this); -builder.setMessage("Are you sure you want to exit?") - .setCancelable(false) - .setPositiveButton("Yes", new DialogInterface.OnClickListener() { +<b>// 1. Instantiate an {@link android.app.AlertDialog.Builder} with its constructor</b> +AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + +<b>// 2. Chain together various setter methods to set the dialog characteristics</b> +builder.setMessage(R.string.dialog_message) + .setTitle(R.string.dialog_title); + +<b>// 3. Get the {@link android.app.AlertDialog} from {@link android.app.AlertDialog.Builder#create()}</b> +AlertDialog dialog = builder.create(); +</pre> + +<p>The following topics show how to define various dialog attributes using the +{@link android.app.AlertDialog.Builder} class.</p> + + + + +<h3 id="AddingButtons">Adding buttons</h3> + +<p>To add action buttons like those in figure 2, +call the {@link android.app.AlertDialog.Builder#setPositiveButton setPositiveButton()} and +{@link android.app.AlertDialog.Builder#setNegativeButton setNegativeButton()} methods:</p> + +<pre style="clear:right"> +AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); +// Add the buttons +builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - MyActivity.this.finish(); + // User clicked OK button } - }) - .setNegativeButton("No", new DialogInterface.OnClickListener() { + }); +builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { - dialog.cancel(); + // User cancelled the dialog } }); -AlertDialog alert = builder.create(); +// Set other dialog properties +... + +// Create the AlertDialog +AlertDialog dialog = builder.create(); </pre> -<p>First, add a message for the dialog with -{@link android.app.AlertDialog.Builder#setMessage(CharSequence)}. Then, begin -method-chaining and set the dialog -to be <em>not cancelable</em> (so the user cannot close the dialog with the back button) -with {@link android.app.AlertDialog.Builder#setCancelable(boolean)}. For each button, -use one of the <code>set...Button()</code> methods, such as -{@link android.app.AlertDialog.Builder#setPositiveButton(CharSequence,DialogInterface.OnClickListener) -setPositiveButton()}, that accepts the name for the button and a +<p>The <code>set...Button()</code> methods require a title for the button (supplied +by a <a href="{@docRoot}guide/topics/resources/string-resource.html">string resource</a>) and a {@link android.content.DialogInterface.OnClickListener} that defines the action to take -when the user selects the button.</p> +when the user presses the button.</p> -<p class="note"><strong>Note:</strong> You can only add one of each button type to the -AlertDialog. That is, you cannot have more than one "positive" button. This limits the number -of possible buttons to three: positive, neutral, and negative. These names are technically irrelevant to the -actual functionality of your buttons, but should help you keep track of which one does what.</p> +<p>There are three different action buttons you can add:</p> +<dl> + <dt>Positive</dt> + <dd>You should use this to accept and continue with the action (the "OK" action).</dd> + <dt>Negative</dt> + <dd>You should use this to cancel the action.</dd> + <dt>Neutral</dt> + <dd>You should use this when the user may not want to proceed with the action, + but doesn't necessarily want to cancel. It appears between the positive and negative + buttons. For example, the action might be "Remind me later."</dd> +</dl> +<p>You can add only one of each button type to an {@link +android.app.AlertDialog}. That is, you cannot have more than one "positive" button.</p> -<h3 id="AddingAList">Adding a list</h3> -<img src="{@docRoot}images/dialog_list.png" alt="" style="float:right" /> -<p>To create an AlertDialog with a list of selectable items like the one shown to the right, -use the <code>setItems()</code> method:</p> +<div class="figure" style="width:290px;margin:0 0 0 40px"> +<img src="{@docRoot}images/ui/dialog_list.png" alt="" /> +<p class="img-caption"><strong>Figure 3.</strong> +A dialog with a title and list.</p> +</div> -<pre> -final CharSequence[] items = {"Red", "Green", "Blue"}; +<h3 id="AddingAList">Adding a list</h3> -AlertDialog.Builder builder = new AlertDialog.Builder(this); -builder.setTitle("Pick a color"); -builder.setItems(items, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int item) { - Toast.makeText(getApplicationContext(), items[item], Toast.LENGTH_SHORT).show(); - } -}); -AlertDialog alert = builder.create(); -</pre> +<p>There are three kinds of lists available with the {@link android.app.AlertDialog} APIs:</p> +<ul> +<li>A traditional single-choice list</li> +<li>A persistent single-choice list (radio buttons)</li> +<li>A persistent multiple-choice list (checkboxes)</li> +</ul> -<p>First, add a title to the dialog with -{@link android.app.AlertDialog.Builder#setTitle(CharSequence)}. -Then, add a list of selectable items with -{@link android.app.AlertDialog.Builder#setItems(CharSequence[],DialogInterface.OnClickListener) -setItems()}, which accepts the array of items to display and a -{@link android.content.DialogInterface.OnClickListener} that defines the action to take -when the user selects an item.</p> +<p>To create a single-choice list like the one in figure 3, +use the {@link android.app.AlertDialog.Builder#setItems setItems()} method:</p> + +<pre style="clear:right"> +@Override +public Dialog onCreateDialog(Bundle savedInstanceState) { + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setTitle(R.string.pick_color); + .setItems(R.array.colors_array, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + // The 'which' argument contains the index position + // of the selected item + } + }); + return builder.create(); +} +</pre> +<p>Because the list appears in the dialog's content area, +the dialog cannot show both a message and a list and you should set a title for the +dialog with {@link android.app.AlertDialog.Builder#setTitle setTitle()}. +To specify the items for the list, call {@link +android.app.AlertDialog.Builder#setItems setItems()}, passing an array. +Alternatively, you can specify a list using {@link +android.app.AlertDialog.Builder#setAdapter setAdapter()}. This allows you to back the list +with dynamic data (such as from a database) using a {@link android.widget.ListAdapter}.</p> + +<p>If you choose to back your list with a {@link android.widget.ListAdapter}, +always use a {@link android.support.v4.content.Loader} so that the content loads +asynchronously. This is described further in +<a href="{@docRoot}guide/topics/ui/declaring-layout.html#AdapterViews">Building Layouts +with an Adapter</a> and the <a href="{@docRoot}guide/components/loaders.html">Loaders</a> +guide.</p> + +<p class="note"><strong>Note:</strong> By default, touching a list item dismisses the dialog, +unless you're using one of the following persistent choice lists.</p> + +<div class="figure" style="width:290px;margin:-30px 0 0 40px"> +<img src="{@docRoot}images/ui/dialog_checkboxes.png" /> +<p class="img-caption"><strong>Figure 4.</strong> +A list of multiple-choice items.</p> +</div> -<h4>Adding checkboxes and radio buttons</h4> -<img src="{@docRoot}images/dialog_singlechoicelist.png" alt="" style="float:right" /> +<h4 id="Checkboxes">Adding a persistent multiple-choice or single-choice list</h4> -<p>To create a list of multiple-choice items (checkboxes) or -single-choice items (radio buttons) inside the dialog, use the +<p>To add a list of multiple-choice items (checkboxes) or +single-choice items (radio buttons), use the {@link android.app.AlertDialog.Builder#setMultiChoiceItems(Cursor,String,String, -DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} and -{@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener) -setSingleChoiceItems()} methods, respectively. -If you create one of these selectable lists in the -{@link android.app.Activity#onCreateDialog(int) onCreateDialog()} callback method, -Android manages the state of the list for you. As long as the Activity is active, -the dialog remembers the items that were previously selected, but when the user exits the -Activity, the selection is lost. - -<p class="note"><strong>Note:</strong> To save the selection when the user leaves or -pauses the Activity, you must properly save and restore the setting throughout -the <a href="{@docRoot}guide/components/activities.html#Lifecycle">activity lifecycle</a>. -To permanently save the selections, even when the Activity process is completely shutdown, -you need to save the settings -with one of the <a href="{@docRoot}guide/topics/data/data-storage.html">Data -Storage</a> techniques.</p> - -<p>To create an AlertDialog with a list of single-choice items like the one shown to the right, -use the same code from the previous example, but replace the <code>setItems()</code> method with +DialogInterface.OnMultiChoiceClickListener) setMultiChoiceItems()} or {@link android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener) -setSingleChoiceItems()}:</p> +setSingleChoiceItems()} methods, respectively.</p> + +<p>For example, here's how you can create a multiple-choice list like the +one shown in figure 4 that saves the selected +items in an {@link java.util.ArrayList}:</p> + +<pre style="clear:right"> +@Override +public Dialog onCreateDialog(Bundle savedInstanceState) { + mSelectedItems = new ArrayList(); // Where we track the selected items + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + // Set the dialog title + builder.setTitle(R.string.pick_toppings) + // Specify the list array, the items to be selected by default (null for none), + // and the listener through which to receive callbacks when items are selected + .setMultiChoiceItems(R.array.toppings, null, + new DialogInterface.OnMultiChoiceClickListener() { + @Override + public void onClick(DialogInterface dialog, int which, + boolean isChecked) { + if (isChecked) { + // If the user checked the item, add it to the selected items + mSelectedItems.add(which); + } else if (mSelectedItems.contains(which)) { + // Else, if the item is already in the array, remove it + mSelectedItems.remove(Integer.valueOf(which)); + } + } + }) + // Set the action buttons + .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + // User clicked OK, so save the mSelectedItems results somewhere + // or return them to the component that opened the dialog + ... + } + }) + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + ... + } + }); + + return builder.create(); +} +</pre> + +<p>Although both a traditional list and a list with radio buttons +provide a "single choice" action, you should use {@link +android.app.AlertDialog.Builder#setSingleChoiceItems(int,int,DialogInterface.OnClickListener) +setSingleChoiceItems()} if you want to persist the user's choice. +That is, if opening the dialog again later should indicate what the user's current choice is, +then you create a list with radio buttons.</p> + + -<pre> -final CharSequence[] items = {"Red", "Green", "Blue"}; -AlertDialog.Builder builder = new AlertDialog.Builder(this); -builder.setTitle("Pick a color"); -builder.setSingleChoiceItems(items, -1, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int item) { - Toast.makeText(getApplicationContext(), items[item], Toast.LENGTH_SHORT).show(); - } -}); -AlertDialog alert = builder.create(); -</pre> -<p>The second parameter in the -{@link android.app.AlertDialog.Builder#setSingleChoiceItems(CharSequence[],int,DialogInterface.OnClickListener) -setSingleChoiceItems()} method is an integer value for the <var>checkedItem</var>, which indicates the -zero-based list position of the default selected item. Use "-1" to indicate that no item should be -selected by default.</p> +<h3 id="CustomLayout">Creating a Custom Layout</h3> +<div class="figure" style="width:290px;margin:-30px 0 0 40px"> +<img src="{@docRoot}images/ui/dialog_custom.png" alt="" /> +<p class="img-caption"><strong>Figure 5.</strong> A custom dialog layout.</p> +</div> + +<p>If you want a custom layout in a dialog, create a layout and add it to an +{@link android.app.AlertDialog} by calling {@link +android.app.AlertDialog.Builder#setView setView()} on your {@link +android.app.AlertDialog.Builder} object.</p> + +<p>By default, the custom layout fills the dialog window, but you can still +use {@link android.app.AlertDialog.Builder} methods to add buttons and a title.</p> -<h2 id="ProgressDialog">Creating a ProgressDialog</h2> +<p>For example, here's the layout file for the dialog in Figure 5:</p> -<img src="{@docRoot}images/dialog_progress_spinning.png" alt="" style="float:right" /> +<p style="clear:right" class="code-caption">res/layout/dialog_signin.xml</p> +<pre> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + <ImageView + android:src="@drawable/header_logo" + android:layout_width="match_parent" + android:layout_height="64dp" + android:scaleType="center" + android:background="#FFFFBB33" + android:contentDescription="@string/app_name" /> + <EditText + android:id="@+id/username" + android:inputType="textEmailAddress" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="4dp" + android:hint="@string/username" /> + <EditText + android:id="@+id/password" + android:inputType="textPassword" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:layout_marginLeft="4dp" + android:layout_marginRight="4dp" + android:layout_marginBottom="16dp" + android:fontFamily="sans-serif" + android:hint="@string/password"/> +</LinearLayout> +</pre> -<p>A {@link android.app.ProgressDialog} is an extension of the {@link android.app.AlertDialog} -class that can display a progress animation in the form of a spinning wheel, for a task with -progress that's undefined, or a progress bar, for a task that has a defined progression. -The dialog can also provide buttons, such as one to cancel a download.</p> +<p class="note"><strong>Tip:</strong> By default, when you set an {@link android.widget.EditText} +element to use the {@code "textPassword"} input type, the font family is set to monospace, so +you should change its font family to {@code "sans-serif"} so that both text fields use +a matching font style.</p> -<p>Opening a progress dialog can be as simple as calling -{@link android.app.ProgressDialog#show(Context,CharSequence,CharSequence) -ProgressDialog.show()}. For example, the progress dialog shown to the right can be -easily achieved without managing the dialog through the -{@link android.app.Activity#onCreateDialog(int)} callback, -as shown here:</p> +<p>To inflate the layout in your {@link android.support.v4.app.DialogFragment}, +get a {@link android.view.LayoutInflater} with +{@link android.app.Activity#getLayoutInflater()} and call +{@link android.view.LayoutInflater#inflate inflate()}, where the first parameter +is the layout resource ID and the second parameter is a parent view for the layout. +You can then call {@link android.app.AlertDialog#setView setView()} +to place the layout in the dialog.</p> <pre> -ProgressDialog dialog = ProgressDialog.show(MyActivity.this, "", - "Loading. Please wait...", true); +@Override +public Dialog onCreateDialog(Bundle savedInstanceState) { + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + // Get the layout inflater + LayoutInflater inflater = getActivity().getLayoutInflater(); + + // Inflate and set the layout for the dialog + // Pass null as the parent view because its going in the dialog layout + builder.setView(inflater.inflate(R.layout.dialog_signin, null)) + // Add action buttons + .setPositiveButton(R.string.signin, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + // sign in the user ... + } + }) + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + NoticeDialog.this.getDialog().cancel(); + } + }); + return builder.create(); +} </pre> -<p>The first parameter is the application {@link android.content.Context}, -the second is a title for the dialog (left empty), the third is the message, -and the last parameter is whether the progress -is indeterminate (this is only relevant when creating a progress bar, which is -discussed in the next section). -</p> +<div class="note"> +<p><strong>Tip:</strong> If you want a custom dialog, +you can instead display an {@link android.app.Activity} as a dialog +instead of using the {@link android.app.Dialog} APIs. Simply create an activity and set its theme to +{@link android.R.style#Theme_Holo_Dialog Theme.Holo.Dialog} +in the <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code +<activity>}</a> manifest element:</p> -<p>The default style of a progress dialog is the spinning wheel. -If you want to create a progress bar that shows the loading progress with granularity, -some more code is required, as discussed in the next section.</p> +<pre> +<activity android:theme="@android:style/Theme.Holo.Dialog" > +</pre> +<p>That's it. The activity now displays in a dialog window instead of fullscreen.</p> +</div> -<h3 id="ShowingAProgressBar">Showing a progress bar</h3> -<img src="/images/dialog_progress_bar.png" alt="" style="float:right" /> +<h2 id="PassingEvents">Passing Events Back to the Dialog's Host</h2> -<p>To show the progression with an animated progress bar:</p> +<p>When the user touches one of the dialog's action buttons or selects an item from its list, +your {@link android.support.v4.app.DialogFragment} might perform the necessary +action itself, but often you'll want to deliver the event to the activity or fragment that +opened the dialog. To do this, define an interface with a method for each type of click event, +then implement that interface in the host component that will +receive the action events from the dialog.</p> -<ol> - <li>Initialize the - ProgressDialog with the class constructor, - {@link android.app.ProgressDialog#ProgressDialog(Context)}.</li> - <li>Set the progress style to "STYLE_HORIZONTAL" with - {@link android.app.ProgressDialog#setProgressStyle(int)} and - set any other properties, such as the message.</li> - <li>When you're ready to show the dialog, call - {@link android.app.Dialog#show()} or return the ProgressDialog from the - {@link android.app.Activity#onCreateDialog(int)} callback.</li> - <li>You can increment the amount of progress displayed - in the bar by calling either {@link android.app.ProgressDialog#setProgress(int)} with a value for - the total percentage completed so far or {@link android.app.ProgressDialog#incrementProgressBy(int)} - with an incremental value to add to the total percentage completed so far.</li> -</ol> +<p>For example, here's a {@link android.support.v4.app.DialogFragment} that defines an +interface through which it delivers the events back to the host activity:</p> -<p>For example, your setup might look like this:</p> <pre> -ProgressDialog progressDialog; -progressDialog = new ProgressDialog(mContext); -progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); -progressDialog.setMessage("Loading..."); -progressDialog.setCancelable(false); +public class NoticeDialog extends DialogFragment { + + /* The activity that creates an instance of this dialog fragment must + * implement this interface in order to receive event callbacks. + * Each method passes the DialogFragment in case the host needs to query it. */ + public interface NoticeDialogListener { + public void onDialogPositiveClick(DialogFragment dialog); + public void onDialogNegativeClick(DialogFragment dialog); + } + + // Use this instance of the interface to deliver action events + static NoticeDialogListener mListener; + + /* Call this to instantiate a new NoticeDialog. + * @param activity The activity hosting the dialog, which must implement the + * NoticeDialogListener to receive event callbacks. + * @returns A new instance of NoticeDialog. + * @throws ClassCastException if the host activity does not + * implement NoticeDialogListener + */ + public static NoticeDialog newInstance(Activity activity) { + // Verify that the host activity implements the callback interface + try { + // Instantiate the NoticeDialogListener so we can send events with it + mListener = (NoticeDialogListener) activity; + } catch (ClassCastException e) { + // The activity doesn't implement the interface, throw exception + throw new ClassCastException(activity.toString() + + " must implement NoticeDialogListener"); + } + NoticeDialog frag = new NoticeDialog(); + return frag; + } + + ... +} </pre> -<p>The setup is simple. Most of the code needed to create a progress dialog is actually -involved in the process that updates it. You might find that it's -necessary to create a second thread in your application for this work and then report the progress -back to the Activity's UI thread with a {@link android.os.Handler} object. -If you're not familiar with using additional -threads with a Handler, see the example Activity below that uses a second thread to -increment a progress dialog managed by the Activity.</p> - -<script type="text/javascript"> -function toggleDiv(link) { - var toggleable = $(link).parent(); - if (toggleable.hasClass("closed")) { - $(".toggleme", toggleable).slideDown("fast"); - toggleable.removeClass("closed"); - toggleable.addClass("open"); - $(".toggle-img", toggleable).attr("title", "hide").attr("src", "/assets/images/triangle-opened.png"); - } else { - $(".toggleme", toggleable).slideUp("fast"); - toggleable.removeClass("open"); - toggleable.addClass("closed"); - $(".toggle-img", toggleable).attr("title", "show").attr("src", "/assets/images/triangle-closed.png"); - } - return false; -} -</script> -<style> -.toggleme { - padding:0 0 1px 0; -} -.toggleable a { - text-decoration:none; -} -.toggleable.closed .toggleme { - display:none; -} -#jd-content .toggle-img { - margin:0; -} -</style> - -<div class="toggleable closed"> - <a href="#" onclick="return toggleDiv(this)"> - <img src="/assets/images/triangle-closed.png" class="toggle-img" /> - <strong>Example ProgressDialog with a second thread</strong></a> - <div class="toggleme"> - <p>This example uses a second thread to track the progress of a process (which actually just -counts up to 100). The thread sends a {@link android.os.Message} back to the main -Activity through a {@link android.os.Handler} each time progress is made. The main Activity then updates the -ProgressDialog.</p> +<p>The activity hosting the dialog creates and shows an instance of the dialog +by calling {@code NoticeDialog.newInstance()} and receives the dialog's +events through an implementation of the {@code NoticeDialogListener} interface:</p> <pre> -package com.example.progressdialog; - -import android.app.Activity; -import android.app.Dialog; -import android.app.ProgressDialog; -import android.os.Bundle; -import android.os.Handler; -import android.os.Message; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; - -public class NotificationTest extends Activity { - static final int PROGRESS_DIALOG = 0; - Button button; - ProgressThread progressThread; - ProgressDialog progressDialog; - - /** Called when the activity is first created. */ - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.main); - - // Setup the button that starts the progress dialog - button = (Button) findViewById(R.id.progressDialog); - button.setOnClickListener(new OnClickListener(){ - public void onClick(View v) { - showDialog(PROGRESS_DIALOG); - } - }); +public class MainActivity extends FragmentActivity + implements NoticeDialog.NoticeDialogListener{ + ... + + public void showNoticeDialog() { + // Create an instance of the dialog fragment and show it + DialogFragment dialog = NoticeDialog.newInstance(this); + dialog.show(getSupportFragmentManager(), "NoticeDialog"); } - - protected Dialog onCreateDialog(int id) { - switch(id) { - case PROGRESS_DIALOG: - progressDialog = new ProgressDialog(NotificationTest.this); - progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); - progressDialog.setMessage("Loading..."); - return progressDialog; - default: - return null; - } + + @Override + public void onDialogPositiveClick(DialogFragment dialog) { + // User touched the dialog's positive button + ... } @Override - protected void onPrepareDialog(int id, Dialog dialog) { - switch(id) { - case PROGRESS_DIALOG: - progressDialog.setProgress(0); - progressThread = new ProgressThread(handler); - progressThread.start(); + public void onDialogNegativeClick(DialogFragment dialog) { + // User touched the dialog's negative button + ... } +} +</pre> - // Define the Handler that receives messages from the thread and update the progress - final Handler handler = new Handler() { - public void handleMessage(Message msg) { - int total = msg.arg1; - progressDialog.setProgress(total); - if (total >= 100){ - dismissDialog(PROGRESS_DIALOG); - progressThread.setState(ProgressThread.STATE_DONE); - } - } - }; - - /** Nested class that performs progress calculations (counting) */ - private class ProgressThread extends Thread { - Handler mHandler; - final static int STATE_DONE = 0; - final static int STATE_RUNNING = 1; - int mState; - int total; - - ProgressThread(Handler h) { - mHandler = h; - } - - public void run() { - mState = STATE_RUNNING; - total = 0; - while (mState == STATE_RUNNING) { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - Log.e("ERROR", "Thread Interrupted"); - } - Message msg = mHandler.obtainMessage(); - msg.arg1 = total; - mHandler.sendMessage(msg); - total++; - } - } - - /* sets the current state for the thread, - * used to stop the thread */ - public void setState(int state) { - mState = state; - } +<p>Because the host activity implements the {@code NoticeDialogListener}—which is +enforced by the {@code newInstance()} method shown above—the dialog fragment can use the +interface callback methods to deliver click events to the activity:</p> + +<pre> +public class NoticeDialog extends DialogFragment { + ... + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + // Build the dialog and set up the button click handlers + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setMessage(R.string.dialog_fire_missiles) + .setPositiveButton(R.string.fire, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // Send the positive button event back to the host activity + mListener.onDialogPositiveClick(NoticeDialog.this); + } + }) + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // Send the negative button event back to the host activity + mListener.onDialogPositiveClick(NoticeDialog.this); + } + }); + return builder.create(); } } </pre> - </div> <!-- end toggleme --> -</div> <!-- end toggleable --> -<h2 id="CustomDialog">Creating a Custom Dialog</h2> -<img src="{@docRoot}images/dialog_custom.png" alt="" style="float:right" /> -<p>If you want a customized design for a dialog, you can create your own layout -for the dialog window with layout and widget elements. -After you've defined your layout, pass the root View object or -layout resource ID to {@link android.app.Dialog#setContentView(View)}.</p> +<h2 id="ShowingADialog">Showing a Dialog</h2> -<p>For example, to create the dialog shown to the right:</p> +<p>When you want to show your dialog, create an instance of your {@link +android.support.v4.app.DialogFragment} and call {@link android.support.v4.app.DialogFragment#show +show()}, passing the {@link android.support.v4.app.FragmentManager} and a tag name +for the dialog fragment.</p> + +<p>You can get the {@link android.support.v4.app.FragmentManager} by calling +{@link android.support.v4.app.FragmentActivity#getSupportFragmentManager()} from +the {@link android.support.v4.app.FragmentActivity} or {@link +android.support.v4.app.Fragment#getFragmentManager()} from a {@link +android.support.v4.app.Fragment}. For example:</p> -<ol> - <li>Create an XML layout saved as <code>custom_dialog.xml</code>: <pre> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/layout_root" - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="10dp" - > - <ImageView android:id="@+id/image" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_marginRight="10dp" - /> - <TextView android:id="@+id/text" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:textColor="#FFF" - /> -</LinearLayout> +public void confirmFireMissiles() { + DialogFragment newFragment = FireMissilesDialog.newInstance(this); + newFragment.show(getSupportFragmentManager(), "missiles"); +} </pre> - <p>This XML defines an {@link android.widget.ImageView} and a {@link android.widget.TextView} - inside a {@link android.widget.LinearLayout}.</p> - <li>Set the above layout as the dialog's content view and define the content - for the ImageView and TextView elements:</p> +<p>The second argument, {@code "missiles"}, is a unique tag name that the system uses to save +and restore the fragment state when necessary. The tag also allows you to get a handle to +the fragment by calling {@link android.support.v4.app.FragmentManager#findFragmentByTag +findFragmentByTag()}.</p> + + + + +<h2 id="FullscreenDialog">Showing a Dialog Fullscreen or as an Embedded Fragment</h2> + +<p>You might have a UI design in which you want a piece of the UI to appear as a dialog in some +situations, but as a full screen or embedded fragment in others (perhaps depending on whether +the device is a large screen or small screen). The {@link android.support.v4.app.DialogFragment} +class offers you this flexibility because it can still behave as an embeddable {@link +android.support.v4.app.Fragment}.</p> + +<p>However, you cannot use {@link android.app.AlertDialog.Builder AlertDialog.Builder} +or other {@link android.app.Dialog} objects to build the dialog in this case. If +you want the {@link android.support.v4.app.DialogFragment} to be +embeddable, you must define the dialog's UI in a layout, then load the layout in the +{@link android.support.v4.app.DialogFragment#onCreateView +onCreateView()} callback.</p> + +<p>Here's an example {@link android.support.v4.app.DialogFragment} that can appear as either a +dialog or an embeddable fragment (using a layout named <code>purchase_items.xml</code>):</p> + <pre> -Context mContext = getApplicationContext(); -Dialog dialog = new Dialog(mContext); +public class CustomLayoutDialog extends DialogFragment { + /** The system calls this to get the DialogFragment's layout, regardless + of whether it's being displayed as a dialog or an embedded fragment. */ + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout to use as dialog or embedded fragment + return inflater.inflate(R.layout.purchase_items, container, false); + } + + /** The system calls this only when creating the layout in a dialog. */ + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + // The only reason you might override this method when using onCreateView() is + // to modify any dialog characteristics. For example, the dialog includes a + // title by default, but your custom layout might not need it. So here you can + // remove the dialog title, but you must call the superclass to get the Dialog. + Dialog dialog = super.onCreateDialog(savedInstanceState); + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + return dialog; + } +} +</pre> -dialog.setContentView(R.layout.custom_dialog); -dialog.setTitle("Custom Dialog"); +<p>And here's some code that decides whether to show the fragment as a dialog +or a fullscreen UI, based on the screen size:</p> -TextView text = (TextView) dialog.findViewById(R.id.text); -text.setText("Hello, this is a custom dialog!"); -ImageView image = (ImageView) dialog.findViewById(R.id.image); -image.setImageResource(R.drawable.android); +<pre> +public void showDialog() { + FragmentManager fragmentManager = getSupportFragmentManager(); + CustomLayoutDialog newFragment = new CustomLayoutDialog(); + + if (mIsLargeLayout) { + // The device is using a large layout, so show the fragment as a dialog + newFragment.show(fragmentManager, "dialog"); + } else { + // The device is smaller, so show the fragment fullscreen + FragmentTransaction transaction = fragmentManager.beginTransaction(); + // For a little polish, specify a transition animation + transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN); + // To make it fullscreen, use the 'content' root view as the container + // for the fragment, which is always the root view for the activity + transaction.add(android.R.id.content, newFragment) + .addToBackStack(null).commit(); + } +} </pre> - <p>After you instantiate the Dialog, set your custom layout as the dialog's content view with - {@link android.app.Dialog#setContentView(int)}, passing it the layout resource ID. - Now that the Dialog has a defined layout, you can capture View objects from the layout with - {@link android.app.Dialog#findViewById(int)} and modify their content.</p> - </li> +<p>For more information about performing fragment transactions, see the +<a href="{@docRoot}guide/components/fragments.html">Fragments</a> guide.</p> - <li>That's it. You can now show the dialog as described in - <a href="#ShowingADialog">Showing A Dialog</a>.</li> -</ol> +<p>In this example, the <code>mIsLargeLayout</code> boolean specifies whether the current device +should use the app's large layout design (and thus show this fragment as a dialog, rather +than fullscreen). The best way to set this kind of boolean is to declare a +<a href="{@docRoot}guide/topics/resources/more-resources.html#Bool">bool resource value</a> +with an <a href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources" +>alternative resource</a> value for different screen sizes. For example, here are two +versions of the bool resource for different screen sizes:</p> -<p>A dialog made with the base Dialog class must have a title. If you don't call -{@link android.app.Dialog#setTitle(CharSequence) setTitle()}, then the space used for the title -remains empty, but still visible. If you don't want -a title at all, then you should create your custom dialog using the -{@link android.app.AlertDialog} class. However, because an AlertDialog is created easiest with -the {@link android.app.AlertDialog.Builder} class, you do not have access to the -{@link android.app.Dialog#setContentView(int)} method used above. Instead, you must use -{@link android.app.AlertDialog.Builder#setView(View)}. This method accepts a {@link android.view.View} object, -so you need to inflate the layout's root View object from -XML.</p> - -<p>To inflate the XML layout, retrieve the {@link android.view.LayoutInflater} with -{@link android.app.Activity#getLayoutInflater()} -(or {@link android.content.Context#getSystemService(String) getSystemService()}), -and then call -{@link android.view.LayoutInflater#inflate(int, ViewGroup)}, where the first parameter -is the layout resource ID and the second is the ID of the root View. At this point, you can use -the inflated layout to find View objects in the layout and define the content for the -ImageView and TextView elements. Then instantiate the AlertDialog.Builder and set the -inflated layout for the dialog with {@link android.app.AlertDialog.Builder#setView(View)}.</p> - -<p>Here's an example, creating a custom layout in an AlertDialog:</p> +<p class="code-caption">res/values/bools.xml</p> +<pre> +<!-- Default boolean values --> +<resources> + <bool name="large_layout">false</bool> +</resources> +</pre> + +<p class="code-caption">res/values-large/bools.xml</p> +<pre> +<!-- Large screen boolean values --> +<resources> + <bool name="large_layout">true</bool> +</resources> +</pre> + +<p>Then you can initialize the {@code mIsLargeLayout} value during the activity's +{@link android.app.Activity#onCreate onCreate()} method:</p> + +<pre> +boolean mIsLargeLayout; + +@Override +public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + mIsLargeLayout = getResources().getBoolean(R.bool.large_layout); +} +</pre> + + + +<h3 id="ActivityAsDialog">Showing an activity as a dialog on large screens</h3> + +<p>Instead of showing a dialog as a fullscreen UI when on small screens, you can accomplish +the same result by showing an {@link android.app.Activity} as a dialog when on +large screens. Which approach you choose depends on your app design, but +showing an activity as a dialog is often useful when your app is already designed for small +screens and you'd like to improve the experience on tablets by showing a short-lived activity +as a dialog.</p> + +<p>To show an activity as a dialog only when on large screens, +apply the {@link android.R.style#Theme_Holo_DialogWhenLarge Theme.Holo.DialogWhenLarge} +theme to the <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code +<activity>}</a> manifest element:</p> <pre> -AlertDialog.Builder builder; -AlertDialog alertDialog; - -Context mContext = getApplicationContext(); -LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(LAYOUT_INFLATER_SERVICE); -View layout = inflater.inflate(R.layout.custom_dialog, - (ViewGroup) findViewById(R.id.layout_root)); - -TextView text = (TextView) layout.findViewById(R.id.text); -text.setText("Hello, this is a custom dialog!"); -ImageView image = (ImageView) layout.findViewById(R.id.image); -image.setImageResource(R.drawable.android); - -builder = new AlertDialog.Builder(mContext); -builder.setView(layout); -alertDialog = builder.create(); +<activity android:theme="@android:style/Theme.Holo.DialogWhenLarge" > </pre> -<p>Using an AlertDialog for your custom layout lets you -take advantage of built-in AlertDialog features like managed buttons, -selectable lists, a title, an icon and so on.</p> +<p>For more information about styling your activities with themes, see the <a +href="{@docRoot}guide/topics/ui/themes.html">Styles and Themes</a> guide.</p> + -<p>For more information, refer to the reference documentation for the -{@link android.app.Dialog} and {@link android.app.AlertDialog.Builder} -classes.</p> +<h2 id="DismissingADialog">Dismissing a Dialog</h2> + +<p>When the user touches any of the action buttons created with an +{@link android.app.AlertDialog.Builder}, the system dismisses the dialog for you.</p> + +<p>The system also dismisses the dialog when the user touches an item in a dialog list, except +when the list uses radio buttons or checkboxes. Otherwise, you can manually dismiss your dialog +by calling {@link android.support.v4.app.DialogFragment#dismiss()} on your {@link +android.support.v4.app.DialogFragment}.</p> + +<p>In case you need to perform certain +actions when the dialog goes away, you can implement the {@link +android.support.v4.app.DialogFragment#onDismiss onDismiss()} method in your {@link +android.support.v4.app.DialogFragment}.</p> + +<p>You can also <em>cancel</em> a dialog. This is a special event that indicates the user +explicitly left the dialog without completing the task. This occurs if the user presses the +<em>Back</em> button, touches the screen outside the dialog area, +or if you explicitly call {@link android.app.Dialog#cancel()} on the {@link +android.app.Dialog} (such as in response to a "Cancel" button in the dialog).</p> + +<p>As shown in the example above, you can respond to the cancel event by implementing +{@link android.support.v4.app.DialogFragment#onCancel onCancel()} in your {@link +android.support.v4.app.DialogFragment} class.</p> + +<p class="note"><strong>Note:</strong> The system calls +{@link android.support.v4.app.DialogFragment#onDismiss onDismiss()} upon each event that +invokes the {@link android.support.v4.app.DialogFragment#onCancel onCancel()} callback. However, +if you call {@link android.app.Dialog#dismiss Dialog.dismiss()} or {@link +android.support.v4.app.DialogFragment#dismiss DialogFragment.dismiss()}, +the system calls {@link android.support.v4.app.DialogFragment#onDismiss onDismiss()} <em>but +not</em> {@link android.support.v4.app.DialogFragment#onCancel onCancel()}. So you should generally +call {@link android.support.v4.app.DialogFragment#dismiss dismiss()} when the user presses the +<em>positive</em> button in your dialog in order to remove the dialog from view.</p> diff --git a/docs/html/images/dialog_buttons.png b/docs/html/images/dialog_buttons.png Binary files differdeleted file mode 100755 index 81aaec4a6ce5..000000000000 --- a/docs/html/images/dialog_buttons.png +++ /dev/null diff --git a/docs/html/images/dialog_custom.png b/docs/html/images/dialog_custom.png Binary files differdeleted file mode 100755 index b2523fd5c892..000000000000 --- a/docs/html/images/dialog_custom.png +++ /dev/null diff --git a/docs/html/images/dialog_list.png b/docs/html/images/dialog_list.png Binary files differdeleted file mode 100755 index f2736bf4218d..000000000000 --- a/docs/html/images/dialog_list.png +++ /dev/null diff --git a/docs/html/images/dialog_progress_bar.png b/docs/html/images/dialog_progress_bar.png Binary files differdeleted file mode 100755 index 3e74419f8976..000000000000 --- a/docs/html/images/dialog_progress_bar.png +++ /dev/null diff --git a/docs/html/images/dialog_progress_spinning.png b/docs/html/images/dialog_progress_spinning.png Binary files differdeleted file mode 100755 index 501f48026637..000000000000 --- a/docs/html/images/dialog_progress_spinning.png +++ /dev/null diff --git a/docs/html/images/dialog_singlechoicelist.png b/docs/html/images/dialog_singlechoicelist.png Binary files differdeleted file mode 100755 index 90629f0f18f8..000000000000 --- a/docs/html/images/dialog_singlechoicelist.png +++ /dev/null diff --git a/docs/html/images/ui/dialog_buttons.png b/docs/html/images/ui/dialog_buttons.png Binary files differnew file mode 100644 index 000000000000..ed952a1afc82 --- /dev/null +++ b/docs/html/images/ui/dialog_buttons.png diff --git a/docs/html/images/ui/dialog_checkboxes.png b/docs/html/images/ui/dialog_checkboxes.png Binary files differnew file mode 100644 index 000000000000..8f272e56271b --- /dev/null +++ b/docs/html/images/ui/dialog_checkboxes.png diff --git a/docs/html/images/ui/dialog_custom.png b/docs/html/images/ui/dialog_custom.png Binary files differnew file mode 100644 index 000000000000..244473bd18b6 --- /dev/null +++ b/docs/html/images/ui/dialog_custom.png diff --git a/docs/html/images/ui/dialog_list.png b/docs/html/images/ui/dialog_list.png Binary files differnew file mode 100644 index 000000000000..437fc74887b8 --- /dev/null +++ b/docs/html/images/ui/dialog_list.png diff --git a/docs/html/images/ui/dialogs.png b/docs/html/images/ui/dialogs.png Binary files differnew file mode 100644 index 000000000000..d45b0b56922c --- /dev/null +++ b/docs/html/images/ui/dialogs.png diff --git a/docs/html/images/ui/dialogs_regions.png b/docs/html/images/ui/dialogs_regions.png Binary files differnew file mode 100644 index 000000000000..2bfc1a4f4009 --- /dev/null +++ b/docs/html/images/ui/dialogs_regions.png diff --git a/docs/html/training/basics/data-storage/databases.jd b/docs/html/training/basics/data-storage/databases.jd new file mode 100644 index 000000000000..3a717dd4f096 --- /dev/null +++ b/docs/html/training/basics/data-storage/databases.jd @@ -0,0 +1,322 @@ +page.title=Saving Data in SQL Databases +parent.title=Data Storage +parent.link=index.html + +trainingnavtop=true +previous.title=Saving Data in Files +previous.link=files.html + +@jd:body + + +<div id="tb-wrapper"> +<div id="tb"> + +<h2>This lesson teaches you to</h2> +<ol> + <li><a href="#DefineContract">Define a Schema and Contract</a></li> + <li><a href="#DbHelper">Create a Database Using a SQL Helper</a></li> + <li><a href="#WriteDbRow">Put Information into a Database</a></li> + <li><a href="#ReadDbRow">Read Information from a Database</a></li> + <li><a href="#DeleteDbRow">Delete Information from a Database</a></li> + <li><a href="#UpdateDbRow">Update a Database</a></li> +</ol> + +<h2>You should also read</h2> +<ul> + <li><a href="{@docRoot}guide/topics/data/data-storage.html#db">Using Databases</a></li> +</ul> + +<!-- +<h2>Try it out</h2> + +<div class="download-box"> + <a href="{@docRoot}shareables/training/Sample.zip" class="button">Download the sample</a> + <p class="filename">Sample.zip</p> +</div> +--> + +</div> +</div> + + +<p>Saving data to a database is ideal for repeating or structured data, +such as contact information. This class assumes that you are +familiar with SQL databases in general and helps you get started with +SQLite databases on Android. The APIs you'll need to use a database +on Android are available in the {@link android.database.sqlite} package.</p> + + +<h2 id="DefineContract">Define a Schema and Contract</h2> + +<p>One of the main principles of SQL databases is the schema: a formal +declaration of how the database is organized. The schema is reflected in the SQL +statements that you use to create your database. You may find it helpful to +create a companion class, known as a <em>contract</em> class, which explicitly specifies +the layout of your schema in a systematic and self-documenting way.</p> + +<p>A contract class is a container for constants that define names for URIs, +tables, and columns. The contract class allows you to use the same constants +across all the other classes in the same package. This lets you change a column +name in one place and have it propagate throughout your code.</p> + +<p>A good way to organize a contract class is to put definitions that are +global to your whole database in the root level of the class. Then create an inner +class for each table that enumerates its columns.</p> + +<p class="note"><strong>Note:</strong> By implementing the {@link +android.provider.BaseColumns} interface, your inner class can inherit a primary +key field called {@code _ID} that some Android classes such as cursor adaptors +will expect it to have. It's not required, but this can help your database +work harmoniously with the Android framework.</p> + +<p>For example, this snippet defines the table name and column names for a +single table:</p> + + +<pre> +public static abstract class FeedEntry implements BaseColumns { + public static final String TABLE_NAME = "entry"; + public static final String COLUMN_NAME_ENTRY_ID = "entryid"; + public static final String COLUMN_NAME_TITLE = "title"; + public static final String COLUMN_NAME_SUBTITLE = "subtitle"; + ... +} +</pre> + + +<p>To prevent someone from accidentally instantiating the contract class, give +it an empty constructor. </p> + +<pre> +// Prevents the FeedReaderContract class from being instantiated. +private FeedReaderContract() {} +</pre> + + + +<h2 id="DbHelper">Create a Database Using a SQL Helper</h2> + +<p>Once you have defined how your database looks, you should implement methods +that create and maintain the database and tables. Here are some typical +statements that create and delete a table:</P> + +<pre> +private static final String TEXT_TYPE = " TEXT"; +private static final String COMMA_SEP = ","; +private static final String SQL_CREATE_ENTRIES = + "CREATE TABLE " + FeedReaderContract.FeedEntry.TABLE_NAME + " (" + + FeedReaderContract.FeedEntry._ID + " INTEGER PRIMARY KEY," + + FeedReaderContract.FeedEntry.COLUMN_NAME_ENTRY_ID + TEXT_TYPE + COMMA_SEP + + FeedReaderContract.FeedEntry.COLUMN_NAME_TITLE + TEXT_TYPE + COMMA_SEP + + ... // Any other options for the CREATE command + " )"; + +private static final String SQL_DELETE_ENTRIES = + "DROP TABLE IF EXISTS " + TABLE_NAME_ENTRIES; +</pre> + +<p>Just like files that you save on the device's <a +href="{@docRoot}guide/topics/data/data-storage.html#filesInternal">internal +storage</a>, Android stores your database in private disk space that's associated +application. Your data is secure, because by default this area is not +accessible to other applications.</p> + +<p>A useful set of APIs is available in the {@link +android.database.sqlite.SQLiteOpenHelper} class. +When you use this class to obtain references to your database, the system +performs the potentially +long-running operations of creating and updating the database only when +needed and <em>not during app startup</em>. All you need to do is call +{@link android.database.sqlite.SQLiteOpenHelper#getWritableDatabase} or +{@link android.database.sqlite.SQLiteOpenHelper#getReadableDatabase}.</p> + +<p class="note"><strong>Note:</strong> Because they can be long-running, +be sure that you call {@link +android.database.sqlite.SQLiteOpenHelper#getWritableDatabase} or {@link +android.database.sqlite.SQLiteOpenHelper#getReadableDatabase} in a background thread, +such as with {@link android.os.AsyncTask} or {@link android.app.IntentService}.</p> + +<p>To use {@link android.database.sqlite.SQLiteOpenHelper}, create a subclass that +overrides the {@link +android.database.sqlite.SQLiteOpenHelper#onCreate onCreate()}, {@link +android.database.sqlite.SQLiteOpenHelper#onUpgrade onUpgrade()} and {@link +android.database.sqlite.SQLiteOpenHelper#onOpen onOpen()} callback methods. You may also +want to implement {@link android.database.sqlite.SQLiteOpenHelper#onDowngrade onDowngrade()}, +but it's not required.</p> + +<p>For example, here's an implementation of {@link +android.database.sqlite.SQLiteOpenHelper} that uses some of the commands shown above:</p> + +<pre> +public class FeedReaderDbHelper extends SQLiteOpenHelper { + // If you change the database schema, you must increment the database version. + public static final int DATABASE_VERSION = 1; + public static final String DATABASE_NAME = "FeedReader.db"; + + public FeedReaderDbHelper(Context context) { + super(context, DATABASE_NAME, null, DATABASE_VERSION); + } + public void onCreate(SQLiteDatabase db) { + db.execSQL(SQL_CREATE_ENTRIES); + } + public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { + // This database is only a cache for online data, so its upgrade policy is + // to simply to discard the data and start over + db.execSQL(SQL_DELETE_ENTRIES); + onCreate(db); + } + public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) { + onUpgrade(db, oldVersion, newVersion); + } +} +</pre> + +<p>To access your database, instantiate your subclass of {@link +android.database.sqlite.SQLiteOpenHelper}:</p> + +<pre> +FeedReaderDbHelper mDbHelper = new FeedReaderDbHelper(getContext()); +</pre> + + + + +<h2 id="WriteDbRow">Put Information into a Database</h2> + +<p>Insert data into the database by passing a {@link android.content.ContentValues} +object to the {@link android.database.sqlite.SQLiteDatabase#insert insert()} method:</p> + +<pre> +// Gets the data repository in write mode +SQLiteDatabase db = mDbHelper.getWritableDatabase(); + +// Create a new map of values, where column names are the keys +ContentValues values = new ContentValues(); +values.put(FeedReaderContract.FeedEntry.COLUMN_NAME_ENTRY_ID, id); +values.put(FeedReaderContract.FeedEntry.COLUMN_NAME_TITLE, title); +values.put(FeedReaderContract.FeedEntry.COLUMN_NAME_CONTENT, content); + +// Insert the new row, returning the primary key value of the new row +long newRowId; +newRowId = db.insert( + FeedReaderContract.FeedEntry.TABLE_NAME, + FeedReaderContract.FeedEntry.COLUMN_NAME_NULLABLE, + values); +</pre> + +<p>The first argument for {@link android.database.sqlite.SQLiteDatabase#insert insert()} +is simply the table name. The second argument provides +the name of a column in which the framework can insert NULL in the event that the +{@link android.content.ContentValues} is empty (if you instead set this to {@code "null"}, +then the framework will not insert a row when there are no values).</p> + + + + +<h2 id="ReadDbRow">Read Information from a Database</h2> + +<p>To read from a database, use the {@link android.database.sqlite.SQLiteDatabase#query query()} +method, passing it your selection criteria and desired columns. +The method combines elements of {@link android.database.sqlite.SQLiteDatabase#insert insert()} +and {@link android.database.sqlite.SQLiteDatabase#update update()}, except the column list +defines the data you want to fetch, rather than the data to insert. The results of the query +are returned to you in a {@link android.database.Cursor} object.</p> + +<pre> +SQLiteDatabase db = mDbHelper.getReadableDatabase(); + +// Define a <em>projection</em> that specifies which columns from the database +// you will actually use after this query. +String[] projection = { + FeedReaderContract.FeedEntry._ID, + FeedReaderContract.FeedEntry.COLUMN_NAME_TITLE, + FeedReaderContract.FeedEntry.COLUMN_NAME_UPDATED, + ... + }; + +// How you want the results sorted in the resulting Cursor +String sortOrder = + FeedReaderContract.FeedEntry.COLUMN_NAME_UPDATED + " DESC"; + +Cursor c = db.query( + FeedReaderContract.FeedEntry.TABLE_NAME, // The table to query + projection, // The columns to return + selection, // The columns for the WHERE clause + selectionArgs, // The values for the WHERE clause + null, // don't group the rows + null, // don't filter by row groups + sortOrder // The sort order + ); +</pre> + +<p>To look at a row in the cursor, use one of the {@link android.database.Cursor} move +methods, which you must always call before you begin reading values. Generally, you should start +by calling {@link android.database.Cursor#moveToFirst}, which places the "read position" on the +first entry in the results. For each row, you can read a column's value by calling one of the +{@link android.database.Cursor} get methods, such as {@link android.database.Cursor#getString +getString()} or {@link android.database.Cursor#getLong getLong()}. For each of the get methods, +you must pass the index position of the column you desire, which you can get by calling +{@link android.database.Cursor#getColumnIndex getColumnIndex()} or +{@link android.database.Cursor#getColumnIndexOrThrow getColumnIndexOrThrow()}. +For example:</p> + +<pre> +cursor.moveToFirst(); +long itemId = cursor.getLong( + cursor.getColumnIndexOrThrow(FeedReaderContract.FeedEntry._ID) +); +</pre> + + + + +<h2 id="DeleteDbRow">Delete Information from a Database</h2> + +<p>To delete rows from a table, you need to provide selection criteria that +identify the rows. The database API provides a mechanism for creating selection +criteria that protects against SQL injection. The mechanism divides the +selection specification into a selection clause and selection arguments. The +clause defines the columns to look at, and also allows you to combine column +tests. The arguments are values to test against that are bound into the clause. +Because the result isn't handled the same as a regular SQL statement, it is +immune to SQL injection.</p> + +<pre> +// Define 'where' part of query. +String selection = FeedReaderContract.FeedEntry.COLUMN_NAME_ENTRY_ID + " LIKE ?"; +// Specify arguments in placeholder order. +String[] selelectionArgs = { String.valueOf(rowId) }; +// Issue SQL statement. +db.delete(table_name, mySelection, selectionArgs); +</pre> + + + +<h2 id="UpdateDbRow">Update a Database</h2> + +<p>When you need to modify a subset of your database values, use the {@link +android.database.sqlite.SQLiteDatabase#update update()} method.</p> + +<p>Updating the table combines the content values syntax of {@link +android.database.sqlite.SQLiteDatabase#insert insert()} with the {@code where} syntax +of {@link android.database.sqlite.SQLiteDatabase#delete delete()}.</p> + +<pre> +SQLiteDatabase db = mDbHelper.getReadableDatabase(); + +// New value for one column +ContentValues values = new ContentValues(); +values.put(FeedReaderContract.FeedEntry.COLUMN_NAME_TITLE, title); + +// Which row to update, based on the ID +String selection = FeedReaderContract.FeedEntry.COLUMN_NAME_ENTRY_ID + " LIKE ?"; +String[] selelectionArgs = { String.valueOf(rowId) }; + +int count = db.update( + FeedReaderDbHelper.FeedEntry.TABLE_NAME, + values, + selection, + selectionArgs); +</pre> + diff --git a/docs/html/training/basics/data-storage/files.jd b/docs/html/training/basics/data-storage/files.jd new file mode 100644 index 000000000000..dd081a6db8e8 --- /dev/null +++ b/docs/html/training/basics/data-storage/files.jd @@ -0,0 +1,382 @@ +page.title=Saving Files +parent.title=Data Storage +parent.link=index.html + +trainingnavtop=true + +@jd:body + + +<div id="tb-wrapper"> +<div id="tb"> + +<h2>This lesson teaches you to</h2> +<ol> + <li><a href="#InternalVsExternalStorage">Choose Internal or External Storage</a></li> + <li><a href="#GetWritePermission">Obtain Permissions for External Storage</a></li> + <li><a href="#WriteInternalStorage">Save a File on Internal Storage</a></li> + <li><a href="#WriteExternalStorage">Save a File on External Storage</a></li> + <li><a href="#GetFreeSpace">Query Free Space</a></li> + <li><a href="#DeleteFile">Delete a File</a></li> +</ol> + +<h2>You should also read</h2> +<ul> + <li><a href="{@docRoot}guide/topics/data/data-storage.html#filesInternal">Using the Internal +Storage</a></li> + <li><a href="{@docRoot}guide/topics/data/data-storage.html#filesExternal">Using the External +Storage</a></li> +</ul> + +</div> +</div> + +<p>Android uses a file system that's +similar to disk-based file systems on other platforms. This lesson describes +how to work with the Android file system to read and write files with the {@link java.io.File} +APIs.</p> + +<p>A {@link java.io.File} object is suited to reading or writing large amounts of data in +start-to-finish order without skipping around. For example, it's good for image files or +anything exchanged over a network.</p> + +<p>This lesson shows how to perform basic file-related tasks in your app. +The lesson assumes that you are familiar with the basics of the Linux file system and the +standard file input/output APIs in {@link java.io}.</p> + + +<h2 id="InternalVsExternalStorage">Choose Internal or External Storage</h2> + +<p>All Android devices have two file storage areas: "internal" and "external" storage. These names +come from the early days of Android, when most devices offered built-in non-volatile memory +(internal storage), plus a removable storage medium such as a micro SD card (external storage). +Some devices divide the permanent storage space into "internal" and "external" partitions, so even +without a removable storage medium, there are always two storage spaces and +the API behavior is the same whether the external storage is removable or not. +The following lists summarize the facts about each storage space.</p> + +<div class="col-5" style="margin-left:0"> +<p><b>Internal storage:</b></p> +<ul> +<li>It's always available.</li> +<li>Files saved here are accessible by only your app by default.</li> +<li>When the user uninstalls your app, the system removes all your app's files from +internal storage.</li> +</ul> +<p>Internal storage is best when you want to be sure that neither the user nor other apps can +access your files.</p> +</div> + +<div class="col-7" style="margin-right:0"> +<p><b>External storage:</b></p> +<ul> +<li>It's not always available, because the user can mount the external storage as USB storage +and in some cases remove it from the device.</li> +<li>It's world-readable, so +files saved here may be read outside of your control.</li> +<li>When the user uninstalls your app, the system removes your app's files from here +only if you save them in the directory from {@link android.content.Context#getExternalFilesDir +getExternalFilesDir()}.</li> +</ul> +<p>External storage is the best +place for files that don't require access restrictions and for files that you want to share +with other apps or allow the user to access with a computer.</p> +</div> + + +<p class="note" style="clear:both"> +<strong>Tip:</strong> Although apps are installed onto the internal storage by +default, you can specify the <a +href="{@docRoot}guide/topics/manifest/manifest-element.html#install">{@code +android:installLocation}</a> attribute in your manifest so your app may +be installed on external storage. Users appreciate this option when the APK size is very large and +they have an external storage space that's larger than the internal storage. For more +information, see <a +href="{@docRoot}guide/topics/data/install-location.html">App Install Location</a>.</p> + + +<h2 id="GetWritePermission">Obtain Permissions for External Storage</h2> + +<p>To write to the external storage, you must request the + {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} permission in your <a +href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest file</a>:</p> + +<pre> +<manifest ...> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> + ... +</manifest> +</pre> + +<div class="caution"><p><strong>Caution:</strong> +Currently, all apps have the ability to read the external storage +without a special permission. However, this will change in a future release. If your app needs +to read the external storage (but not write to it), then you will need to declare the {@link +android.Manifest.permission#READ_EXTERNAL_STORAGE} permission. To ensure that your app continues +to work as expected, you should declare this permission now, before the change takes effect.</p> +<pre> +<manifest ...> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + ... +</manifest> +</pre> +<p>However, if your app uses the {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} +permission, then it implicitly has permission to read the external storage as well.</p> +</div> + +<p>You don’t need any permissions to save files on the internal +storage. Your application always has permission to read and +write files in its internal storage directory.</p> + + + + + +<h2 id="WriteInternalStorage">Save a File on Internal Storage</h2> + +<p>When saving a file to internal storage, you can acquire the appropriate directory as a +{@link java.io.File} by calling one of two methods:</p> + +<dl> + <dt>{@link android.content.Context#getFilesDir}</dt> + <dd>Returns a {@link java.io.File} representing an internal directory for your app.</dd> + <dt>{@link android.content.Context#getCacheDir}</dt> + <dd>Returns a {@link java.io.File} representing an internal directory for your app's temporary +cache files. Be sure to delete each file once it is no +longer needed and implement a reasonable size limit for the amount of memory you use at any given +time, such as 1MB. If the system begins running low on storage, it may delete your cache files +without warning.</dd> +</dl> + +<p>To create a new file in one of these directories, you can use the {@link +java.io.File#File(File,String) File()} constructor, passing the {@link java.io.File} provided by one +of the above methods that specifies your internal storage directory. For example:</p> + +<pre> +File file = new File(context.getFilesDir(), filename); +</pre> + +<p>Alternatively, you can call {@link +android.content.Context#openFileOutput openFileOutput()} to get a {@link java.io.FileOutputStream} +that writes to a file in your internal directory. For example, here's +how to write some text to a file:</p> + +<pre> +String filename = "myfile"; +String string = "Hello world!"; +FileOutputStream outputStream; + +try { + outputStream = openFileOutput(filename, Context.MODE_PRIVATE); + outputStream.write(string.getBytes()); + outputStream.close(); +} catch (Exception e) { + e.printStackTrace(); +} +</pre> + +<p>Or, if you need to cache some files, you should instead use {@link +java.io.File#createTempFile createTempFile()}. For example, the following method extracts the +file name from a {@link java.net.URL} and creates a file with that name +in your app's internal cache directory:</p> + +<pre> +public File getTempFile(Context context, String url) { + File file; + try { + String fileName = Uri.parse(url).getLastPathSegment(); + file = File.createTempFile(fileName, null, context.getCacheDir()); + catch (IOException e) { + // Error while creating file + } + return file; +} +</pre> + +<p class="note"><strong>Note:</strong> +Your app's internal storage directory is specified +by your app's package name in a special location of the Android file system. +Technically, another app can read your internal files if you set +the file mode to be readable. However, the other app would also need to know your app package +name and file names. Other apps cannot browse your internal directories and do not have +read or write access unless you explicitly set the files to be readable or writable. So as long +as you use {@link android.content.Context#MODE_PRIVATE} for your files on the internal storage, +they are never accessible to other apps.</p> + + + + + +<h2 id="WriteExternalStorage">Save a File on External Storage</h2> + +<p>Because the external storage may be unavailable—such as when the user has mounted the +storage to a PC or has removed the SD card that provides the external storage—you +should always verify that the volume is available before accessing it. You can query the external +storage state by calling {@link android.os.Environment#getExternalStorageState}. If the returned +state is equal to {@link android.os.Environment#MEDIA_MOUNTED}, then you can read and +write your files. For example, the following methods are useful to determine the storage +availability:</p> + +<pre> +/* Checks if external storage is available for read and write */ +public boolean isExternalStorageWritable() { + String state = Environment.getExternalStorageState(); + if (Environment.MEDIA_MOUNTED.equals(state)) { + return true; + } + return false; +} + +/* Checks if external storage is available to at least read */ +public boolean isExternalStorageReadable() { + String state = Environment.getExternalStorageState(); + if (Environment.MEDIA_MOUNTED.equals(state) || + Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) { + return true; + } + return false; +} +</pre> + +<p>Although the external storage is modifiable by the user and other apps, there are two +categories of files you might save here:</p> + +<dl> + <dt>Public files</dt> + <dd>Files that +should be freely available to other apps and to the user. When the user uninstalls your app, +these files should remain available to the user. + <p>For example, photos captured by your app or other downloaded files.</p> + </dd> + <dt>Private files</dt> + <dd>Files that rightfully belong to your app and should be deleted when the user uninstalls + your app. Although these files are technically accessible by the user and other apps because they + are on the external storage, they are files that realistically don't provide value to the user + outside your app. When the user uninstalls your app, the system deletes + all files in your app's external private directory. + <p>For example, additional resources downloaded by your app or temporary media files.</p> + </dd> +</dl> + +<p>If you want to save public files on the external storage, use the +{@link android.os.Environment#getExternalStoragePublicDirectory +getExternalStoragePublicDirectory()} method to get a {@link java.io.File} representing +the appropriate directory on the external storage. The method takes an argument specifying +the type of file you want to save so that they can be logically organized with other public +files, such as {@link android.os.Environment#DIRECTORY_MUSIC} or {@link +android.os.Environment#DIRECTORY_PICTURES}. For example:</p> + +<pre> +public File getAlbumStorageDir(String albumName) { + // Get the directory for the user's public pictures directory. + File file = new File(Environment.getExternalStoragePublicDirectory( + Environment.DIRECTORY_PICTURES), albumName); + if (!file.mkdirs()) { + Log.e(LOG_TAG, "Directory not created"); + } + return file; +} +</pre> + + +<p>If you want to save files that are private to your app, you can acquire the +appropriate directory by calling {@link +android.content.Context#getExternalFilesDir getExternalFilesDir()} and passing it a name indicating +the type of directory you'd like. Each directory created this way is added to a parent +directory that encapsulates all your app's external storage files, which the system deletes when the +user uninstalls your app.</p> + +<p>For example, here's a method you can use to create a directory for an individual photo album:</p> + +<pre> +public File getAlbumStorageDir(Context context, String albumName) { + // Get the directory for the app's private pictures directory. + File file = new File(context.getExternalFilesDir( + Environment.DIRECTORY_PICTURES), albumName); + if (!file.mkdirs()) { + Log.e(LOG_TAG, "Directory not created"); + } + return file; +} +</pre> + +<p>If none of the pre-defined sub-directory names suit your files, you can instead call {@link +android.content.Context#getExternalFilesDir getExternalFilesDir()} and pass {@code null}. This +returns the root directory for your app's private directory on the external storage.</p> + +<p>Remember that {@link android.content.Context#getExternalFilesDir getExternalFilesDir()} +creates a directory inside a directory that is deleted when the user uninstalls your app. +If the files you're saving should remain available after the user uninstalls your +app—such as when your app is a camera and the user will want to keep the photos—you +should instead use {@link android.os.Environment#getExternalStoragePublicDirectory +getExternalStoragePublicDirectory()}.</p> + + +<p>Regardless of whether you use {@link +android.os.Environment#getExternalStoragePublicDirectory +getExternalStoragePublicDirectory()} for files that are shared or +{@link android.content.Context#getExternalFilesDir +getExternalFilesDir()} for files that are private to your app, it's important that you use +directory names provided by API constants like +{@link android.os.Environment#DIRECTORY_PICTURES}. These directory names ensure +that the files are treated properly by the system. For instance, files saved in {@link +android.os.Environment#DIRECTORY_RINGTONES} are categorized by the system media scanner as ringtones +instead of music.</p> + + + + +<h2 id="GetFreeSpace">Query Free Space</h2> + +<p>If you know ahead of time how much data you're saving, you can find out +whether sufficient space is available without causing an {@link +java.io.IOException} by calling {@link java.io.File#getFreeSpace} or {@link +java.io.File#getTotalSpace}. These methods provide the current available space and the +total space in the storage volume, respectively. This information is also useful to avoid filling +the storage volume above a certain threshold.</p> + +<p>However, the system does not guarantee that you can write as many bytes as are +indicated by {@link java.io.File#getFreeSpace}. If the number returned is a +few MB more than the size of the data you want to save, or if the file system +is less than 90% full, then it's probably safe to proceed. +Otherwise, you probably shouldn't write to storage.</p> + +<p class="note"><strong>Note:</strong> You aren't required to check the amount of available space +before you save your file. You can instead try writing the file right away, then +catch an {@link java.io.IOException} if one occurs. You may need to do +this if you don't know exactly how much space you need. For example, if you +change the file's encoding before you save it by converting a PNG image to +JPEG, you won't know the file's size beforehand.</p> + + + + +<h2 id="DeleteFile">Delete a File</h2> + +<p>You should always delete files that you no longer need. The most straightforward way to delete a +file is to have the opened file reference call {@link java.io.File#delete} on itself.</p> + +<pre> +myFile.delete(); +</pre> + +<p>If the file is saved on internal storage, you can also ask the {@link android.content.Context} to locate and +delete a file by calling {@link android.content.Context#deleteFile deleteFile()}:</p> + +<pre> +myContext.deleteFile(fileName); +</pre> + +<div class="note"> +<p><strong>Note:</strong> When the user uninstalls your app, the Android system deletes +the following:</p> +<ul> +<li>All files you saved on internal storage</li> +<li>All files you saved on external storage using {@link +android.content.Context#getExternalFilesDir getExternalFilesDir()}.</li> +</ul> +<p>However, you should manually delete all cached files created with +{@link android.content.Context#getCacheDir()} on a regular basis and also regularly delete +other files you no longer need.</p> +</div> + diff --git a/docs/html/training/basics/data-storage/index.jd b/docs/html/training/basics/data-storage/index.jd new file mode 100644 index 000000000000..99bb26145c6d --- /dev/null +++ b/docs/html/training/basics/data-storage/index.jd @@ -0,0 +1,55 @@ +page.title=Saving Data + +trainingnavtop=true +startpage=true + +@jd:body + +<div id="tb-wrapper"> +<div id="tb"> + +<h2>Dependencies and prerequisites</h2> +<ul> + <li>Android 1.6 (API Level 4) or higher</li> + <li>Familiarity with Map key-value collections</li> + <li>Familiarity with the Java file I/O API</li> + <li>Familiarity with SQL databases</li> +</ul> + +<h2>You should also read</h2> +<ul> + <li><a href="{@docRoot}guide/topics/data/data-storage.html">Storage Options</a></li> +</ul> + +</div> +</div> + +<p>Most Android apps need to save data, even if only to save information about the app state +during {@link android.app.Activity#onPause onPause()} so the user's progress is not lost. Most +non-trivial apps also need to save user settings, and some apps must manage large +amounts of information in files and databases. This class introduces you to the +principal data storage options in Android, including:</p> + +<ul> + <li>Saving key-value pairs of simple data types in a shared preferences +file</li> + <li>Saving arbitrary files in Android's file system</li> + <li>Using databases managed by SQLite</li> +</ul> + + +<h2>Lessons</h2> + +<dl> + <dt><b><a href="shared-preferences.html">Saving Data in Shared Preferences</a></b></dt> + <dd>Learn to use a shared preferences file for storing small amounts of information in +key-value pairs.</dd> + + <dt><b><a href="files.html">Saving Data in Files</a></b></dt> + <dd>Learn to save a basic file, such as to store long sequences of data that + are generally read in order.</dd> + + <dt><b><a href="databases.html">Saving Data in SQL Databases</a></b></dt> + <dd>Learn to use a SQLite database to read and write structured data.</dd> + +</dl> diff --git a/docs/html/training/basics/data-storage/shared-preferences.jd b/docs/html/training/basics/data-storage/shared-preferences.jd new file mode 100644 index 000000000000..67f45cb5c7f2 --- /dev/null +++ b/docs/html/training/basics/data-storage/shared-preferences.jd @@ -0,0 +1,121 @@ +page.title=Saving Key-Value Sets +parent.title=Data Storage +parent.link=index.html + +trainingnavtop=true + +@jd:body + + +<div id="tb-wrapper"> +<div id="tb"> + +<h2>This lesson teaches you to</h2> +<ol> + <li><a href="#GetSharedPreferences">Get a Handle to a SharedPreferences</a></li> + <li><a href="#WriteSharedPreference">Write to Shared Preferences</a></li> + <li><a href="#ReadSharedPreference">Read from Shared Preferences</a></li> +</ol> + +<h2>You should also read</h2> +<ul> + <li><a href="{@docRoot}guide/topics/data/data-storage.html#pref">Using Shared Preferences</a></li> +</ul> + +</div> +</div> + + +<p>If you have a relatively small collection of key-values that you'd like to save, +you should use the {@link android.content.SharedPreferences} APIs. +A {@link android.content.SharedPreferences} object points to a file containing +key-value pairs and provides simple methods to read and write them. Each +{@link android.content.SharedPreferences} file is +managed by the framework and can be private or shared.</p> + +<p>This class shows you how to use the {@link android.content.SharedPreferences} APIs to store and +retrieve simple values.</p> + +<p class="note"><strong>Note:</strong> The {@link android.content.SharedPreferences} APIs are +only for reading and writing key-value pairs and you should not confuse them with the +{@link android.preference.Preference} APIs, which help you build a user interface +for your app settings (although they use {@link android.content.SharedPreferences} as their +implementation to save the app settings). For information about using the {@link +android.preference.Preference} APIs, see the <a href="{@docRoot}guide/topics/ui/settings.html" +>Settings</a> guide.</p> + +<h2 id="GetSharedPreferences">Get a Handle to a SharedPreferences</h2> + +<p>You can create a new shared preference file or access an existing +one by calling one of two methods:</p> +<ul> + <li>{@link android.content.Context#getSharedPreferences(String,int) +getSharedPreferences()} — Use this if you need multiple shared preference files identified +by name, which you specify with the first parameter. You can call this from any +{@link android.content.Context} in your app.</li> + <li>{@link android.app.Activity#getPreferences(int) getPreferences()} — Use this from an +{@link android.app.Activity} if you need +to use only one shared preference file for the activity. Because this retrieves a default shared +preference file that belongs to the activity, you don't need to supply a name.</li> +</ul> + +<p>For example, the following code is executed inside a {@link android.app.Fragment}. +It accesses the shared preferences file that's +identified by the resource string {@code R.string.preference_file_key} and opens it using +the private mode so the file is accessible by only your app.</p> + +<pre> +Context context = getActivity(); +SharedPreferences sharedPref = context.getSharedPreferences( + getString(R.string.preference_file_key), Context.MODE_PRIVATE); +</pre> + +<p>When naming your shared preference files, you should use a name that's uniquely identifiable +to your app, such as {@code "com.example.myapp.PREFERENCE_FILE_KEY"}</p> + +<p>Alternatively, if you need just one shared preference file for your activity, you can use the +{@link android.app.Activity#getPreferences(int) getPreferences()} method:</p> + +<pre> +SharedPreferences sharedPref = getActivity().getPreferences(Context.MODE_PRIVATE); +</pre> + +<p class="caution"><strong>Caution:</strong> If you create a shared preferences file +with {@link android.content.Context#MODE_WORLD_READABLE} or {@link +android.content.Context#MODE_WORLD_WRITEABLE}, then any other apps that know the file identifier +can access your data.</p> + + +<h2 id="WriteSharedPreference">Write to Shared Preferences</h2> + +<p>To write to a shared preferences file, create a {@link +android.content.SharedPreferences.Editor} by calling {@link +android.content.SharedPreferences#edit} on your {@link android.content.SharedPreferences}.</p> + +<p>Pass the keys and values you want to write with methods such as {@link +android.content.SharedPreferences.Editor#putInt putInt()} and {@link +android.content.SharedPreferences.Editor#putString putString()}. Then call {@link +android.content.SharedPreferences.Editor#commit} to save the changes. For example:</p> + +<pre> +SharedPreferences sharedPref = getActivity().getPreferences(Context.MODE_PRIVATE); +SharedPreferences.Editor editor = sharedPref.edit(); +editor.putInt(getString(R.string.saved_high_score), newHighScore); +editor.commit(); +</pre> + + +<h2 id="ReadSharedPreference">Read from Shared Preferences</h2> + +<p>To retrieve values from a shared preferences file, call methods such as {@link +android.content.SharedPreferences#getInt getInt()} and {@link +android.content.SharedPreferences#getString getString()}, providing the key for the value +you want, and optionally a default value to return if the key isn't +present. For example:</p> + +<pre> +SharedPreferences sharedPref = getActivity().getPreferences(Context.MODE_PRIVATE); +long default = getResources().getInteger(R.string.saved_high_score_default)); +long highScore = sharedPref.getInt(getString(R.string.saved_high_score), default); +</pre> + diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs index b70ba3f4828c..4ad13533bfc2 100644 --- a/docs/html/training/training_toc.cs +++ b/docs/html/training/training_toc.cs @@ -104,6 +104,26 @@ </li> <li class="nav-section"> + <div class="nav-section-header"><a href="<?cs var:toroot?>training/basics/data-storage/index.html"> + <span class="en">Saving Data</span> + </a></div> + <ul> + <li><a href="<?cs var:toroot ?>training/basics/data-storage/shared-preferences.html"> + <span class="en">Saving Key-Value Sets</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/data-storage/files.html"> + <span class="en">Saving Files</span> + </a> + </li> + <li><a href="<?cs var:toroot ?>training/basics/data-storage/databases.html"> + <span class="en">Saving Data in SQL Databases</span> + </a> + </li> + </ul> + </li> + + <li class="nav-section"> <div class="nav-section-header"><a href="<?cs var:toroot ?>training/basics/intents/index.html"> <span class="en">Interacting with Other Apps</span> </a></div> @@ -215,41 +235,31 @@ </li> <li class="nav-section"> - <div class="nav-section-header"><a href="<?cs var:toroot ?>training/multiscreen/index.html"> - <span class="en">Designing for Multiple Screens</span> - <span class="es">Cómo diseñar aplicaciones para varias pantallas</span> - <span class="ja">複数画面のデザイン</span> - <span class="ko">Designing for Multiple Screens</span> - <span class="ru">Designing for Multiple Screens</span> - <span class="zh-CN">针对多种屏幕进行设计</span> - </a></div> + <div class="nav-section-header"><a href="<?cs var:toroot ?>training/multiscreen/index.html" + zh-CN-lang="针对多种屏幕进行设计" + ja-lang="複数画面のデザイン" + es-lang="Cómo diseñar aplicaciones para varias pantallas" + >Designing for Multiple Screens</a> + </div> <ul> - <li><a href="<?cs var:toroot ?>training/multiscreen/screensizes.html"> - <span class="en">Supporting Different Screen Sizes</span> - <span class="es">Cómo admitir varios tamaños de pantalla</span> - <span class="ja">さまざまな画面サイズのサポート</span> - <span class="ko">다양한 화면 크기 지원</span> - <span class="ru">Supporting Different Screen Sizes</span> - <span class="zh-CN">支持各种屏幕尺寸</span> - </a> - </li> - <li><a href="<?cs var:toroot ?>training/multiscreen/screendensities.html"> - <span class="en">Supporting Different Screen Densities</span> - <span class="es">Cómo admitir varias densidades de pantalla</span> - <span class="ja">さまざまな画面密度のサポート</span> - <span class="ko">Supporting Different Screen Densities</span> - <span class="ru">Supporting Different Screen Densities</span> - <span class="zh-CN">支持各种屏幕密度</span> - </a> - </li> - <li><a href="<?cs var:toroot ?>training/multiscreen/adaptui.html"> - <span class="en">Implementing Adaptive UI Flows</span> - <span class="es">Cómo implementar interfaces de usuario adaptables</span> - <span class="ja">順応性のある UI フローの実装</span> - <span class="ko">Implementing Adaptive UI Flows</span> - <span class="ru">Implementing Adaptive UI Flows</span> - <span class="zh-CN">实施自适应用户界面流程</span> - </a> + <li><a href="<?cs var:toroot ?>training/multiscreen/screensizes.html" + zh-CN-lang="支持各种屏幕尺寸" + ko-lang="다양한 화면 크기 지원" + ja-lang="さまざまな画面サイズのサポート" + es-lang="Cómo admitir varios tamaños de pantalla" + >Designing for Multiple Screens</a> + </li> + <li><a href="<?cs var:toroot ?>training/multiscreen/screendensities.html" + zh-CN-lang="支持各种屏幕密度" + ja-lang="さまざまな画面密度のサポート" + es-lang="Cómo admitir varias densidades de pantalla" + >Supporting Different Screen Densities</a> + </li> + <li><a href="<?cs var:toroot ?>training/multiscreen/adaptui.html" + zh-CN-lang="实施自适应用户界面流程" + ja-lang="順応性のある UI フローの実装" + es-lang="Cómo implementar interfaces de usuario adaptables" + >Implementing Adaptive UI Flows</a> </li> </ul> </li> @@ -299,50 +309,36 @@ </li> <li class="nav-section"> - <div class="nav-section-header"><a href="<?cs var:toroot ?>training/monitoring-device-state/index.html"> - <span class="en">Optimizing Battery Life</span> - <span class="es">Cómo optimizar la duración de la batería</span> - <span class="ja">電池消費量の最適化</span> - <span class="ko">Optimizing Battery Life</span> - <span class="ru">Optimizing Battery Life</span> - <span class="zh-CN">优化电池使用时间</span> - </a></div> + <div class="nav-section-header"><a href="<?cs var:toroot ?>training/monitoring-device-state/index.html" + zh-CN-lang="优化电池使用时间" + ja-lang="電池消費量の最適化" + es-lang="Cómo optimizar la duración de la batería" + >Optimizing Battery Life</a> + </div> <ul> - <li><a href="<?cs var:toroot ?>training/monitoring-device-state/battery-monitoring.html"> - <span class="en">Monitoring the Battery Level and Charging State</span> - <span class="es">Cómo controlar el nivel de batería y el estado de carga</span> - <span class="ja">電池残量と充電状態の監視</span> - <span class="ko">Monitoring the Battery Level and Charging State</span> - <span class="ru">Monitoring the Battery Level and Charging State</span> - <span class="zh-CN">监控电池电量和充电状态</span> - </a> - </li> - <li><a href="<?cs var:toroot ?>training/monitoring-device-state/docking-monitoring.html"> - <span class="en">Determining and Monitoring the Docking State and Type</span> - <span class="es">Cómo determinar y controlar el tipo de conector y el estado de la conexión</span> - <span class="ja">ホルダーの装着状態とタイプの特定と監視</span> - <span class="ko">Determining and Monitoring the Docking State and Type</span> - <span class="ru">Determining and Monitoring the Docking State and Type</span> - <span class="zh-CN">确定和监控基座对接状态和类型</span> - </a> - </li> - <li><a href="<?cs var:toroot ?>training/monitoring-device-state/connectivity-monitoring.html"> - <span class="en">Determining and Monitoring the Connectivity Status</span> - <span class="es">Cómo determinar y controlar el estado de la conectividad</span> - <span class="ja">接続状態の特定と監視</span> - <span class="ko">Determining and Monitoring the Connectivity Status</span> - <span class="ru">Determining and Monitoring the Connectivity Status</span> - <span class="zh-CN">确定和监控网络连接状态</span> - </a> - </li> - <li><a href="<?cs var:toroot ?>training/monitoring-device-state/manifest-receivers.html"> - <span class="en">Manipulating Broadcast Receivers On Demand</span> - <span class="es">Cómo manipular los receptores de emisión bajo demanda</span> - <span class="ja">オンデマンドでのブロードキャスト レシーバ操作</span> - <span class="ko">Manipulating Broadcast Receivers On Demand</span> - <span class="ru">Manipulating Broadcast Receivers On Demand</span> - <span class="zh-CN">根据需要操作广播接收器</span> - </a> + <li><a href="<?cs var:toroot ?>training/monitoring-device-state/battery-monitoring.html" + zh-CN-lang="监控电池电量和充电状态" + ja-lang="電池残量と充電状態の監視" + es-lang="Cómo controlar el nivel de batería y el estado de carga" + >Monitoring the Battery Level and Charging State</a> + </li> + <li><a href="<?cs var:toroot ?>training/monitoring-device-state/docking-monitoring.html" + zh-CN-lang="确定和监控基座对接状态和类型" + ja-lang="ホルダーの装着状態とタイプの特定と監視" + es-lang="Cómo determinar y controlar el tipo de conector y el estado de la conexión" + >Determining and Monitoring the Docking State and Type</a> + </li> + <li><a href="<?cs var:toroot ?>training/monitoring-device-state/connectivity-monitoring.html" + zh-CN-lang="确定和监控网络连接状态" + ja-lang="接続状態の特定と監視" + es-lang="Cómo determinar y controlar el estado de la conectividad" + >Determining and Monitoring the Connectivity Status</a> + </li> + <li><a href="<?cs var:toroot ?>training/monitoring-device-state/manifest-receivers.html" + zh-CN-lang="根据需要操作广播接收器" + ja-lang="オンデマンドでのブロードキャスト レシーバ操作" + es-lang="Cómo manipular los receptores de emisión bajo demanda" + >Manipulating Broadcast Receivers On Demand</a> </li> </ul> </li> diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java index 4561397d0e1f..d11e55405393 100644 --- a/graphics/java/android/graphics/drawable/ColorDrawable.java +++ b/graphics/java/android/graphics/drawable/ColorDrawable.java @@ -20,6 +20,7 @@ import android.graphics.*; import android.content.res.Resources; import android.content.res.TypedArray; import android.util.AttributeSet; +import android.view.ViewDebug; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -34,6 +35,7 @@ import java.io.IOException; * @attr ref android.R.styleable#ColorDrawable_color */ public class ColorDrawable extends Drawable { + @ViewDebug.ExportedProperty(deepExport = true, prefix = "state_") private ColorState mState; private final Paint mPaint = new Paint(); private boolean mMutated; @@ -174,6 +176,7 @@ public class ColorDrawable extends Drawable { final static class ColorState extends ConstantState { int mBaseColor; // base color, independent of setAlpha() + @ViewDebug.ExportedProperty int mUseColor; // basecolor modulated by setAlpha() int mChangingConfigurations; diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 2ca54d4dca0f..8374b10d392e 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -478,6 +478,9 @@ public class GradientDrawable extends Drawable { mFillPaint.setAlpha(currFillAlpha); mFillPaint.setDither(mDither); mFillPaint.setColorFilter(mColorFilter); + if (mColorFilter != null && !mGradientState.mHasSolidColor) { + mFillPaint.setColor(0xff000000); + } if (haveStroke) { mStrokePaint.setAlpha(currStrokeAlpha); mStrokePaint.setDither(mDither); @@ -513,7 +516,10 @@ public class GradientDrawable extends Drawable { canvas.drawRoundRect(mRect, rad, rad, mStrokePaint); } } else { - canvas.drawRect(mRect, mFillPaint); + if (mFillPaint.getColor() != 0 || mColorFilter != null || + mFillPaint.getShader() != null) { + canvas.drawRect(mRect, mFillPaint); + } if (haveStroke) { canvas.drawRect(mRect, mStrokePaint); } @@ -736,6 +742,9 @@ public class GradientDrawable extends Drawable { mFillPaint.setShader(new LinearGradient(x0, y0, x1, y1, colors, st.mPositions, Shader.TileMode.CLAMP)); + if (!mGradientState.mHasSolidColor) { + mFillPaint.setColor(0xff000000); + } } else if (st.mGradient == RADIAL_GRADIENT) { x0 = r.left + (r.right - r.left) * st.mCenterX; y0 = r.top + (r.bottom - r.top) * st.mCenterY; @@ -745,6 +754,9 @@ public class GradientDrawable extends Drawable { mFillPaint.setShader(new RadialGradient(x0, y0, level * st.mGradientRadius, colors, null, Shader.TileMode.CLAMP)); + if (!mGradientState.mHasSolidColor) { + mFillPaint.setColor(0xff000000); + } } else if (st.mGradient == SWEEP_GRADIENT) { x0 = r.left + (r.right - r.left) * st.mCenterX; y0 = r.top + (r.bottom - r.top) * st.mCenterY; @@ -775,6 +787,9 @@ public class GradientDrawable extends Drawable { } mFillPaint.setShader(new SweepGradient(x0, y0, tempColors, tempPositions)); + if (!mGradientState.mHasSolidColor) { + mFillPaint.setColor(0xff000000); + } } } } @@ -1251,6 +1266,11 @@ public class GradientDrawable extends Drawable { private void initializeWithState(GradientState state) { if (state.mHasSolidColor) { mFillPaint.setColor(state.mSolidColor); + } else if (state.mColors == null) { + // If we don't have a solid color and we don't have a gradient, + // the app is stroking the shape, set the color to the default + // value of state.mSolidColor + mFillPaint.setColor(0); } mPadding = state.mPadding; if (state.mStrokeWidth >= 0) { diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java b/graphics/java/android/renderscript/ScriptIntrinsicBlur.java index 61e5d4f38d36..2a04b42a1b37 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicBlur.java @@ -69,13 +69,13 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic { /** * Set the radius of the Blur. * - * Supported range 0-25 + * Supported range 0 < radius <= 25 * * @param radius The radius of the blur */ public void setRadius(float radius) { - if (radius < 0 || radius > 25) { - throw new RSIllegalArgumentException("Radius out of range (0-25)."); + if (radius <= 0 || radius > 25) { + throw new RSIllegalArgumentException("Radius out of range (0 < r <= 25)."); } setVar(0, radius); } diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index c2e6ee39a9c9..7c23e4b373d6 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2440,16 +2440,33 @@ status_t OpenGLRenderer::drawArc(float left, float top, float right, float botto return drawShape(left, top, texture, paint); } +// See SkPaintDefaults.h +#define SkPaintDefaults_MiterLimit SkIntToScalar(4) + status_t OpenGLRenderer::drawRect(float left, float top, float right, float bottom, SkPaint* p) { if (mSnapshot->isIgnored() || quickRejectPreStroke(left, top, right, bottom, p)) { return DrawGlInfo::kStatusDone; } - // only fill style is supported by drawConvexPath, since others have to handle joins if (p->getStyle() != SkPaint::kFill_Style) { - mCaches.activeTexture(0); - const PathTexture* texture = mCaches.rectShapeCache.getRect(right - left, bottom - top, p); - return drawShape(left, top, texture, p); + // only fill style is supported by drawConvexPath, since others have to handle joins + if (p->getPathEffect() != 0 || p->getStrokeJoin() != SkPaint::kMiter_Join || + p->getStrokeMiter() != SkPaintDefaults_MiterLimit) { + mCaches.activeTexture(0); + const PathTexture* texture = + mCaches.rectShapeCache.getRect(right - left, bottom - top, p); + return drawShape(left, top, texture, p); + } + + SkPath path; + SkRect rect = SkRect::MakeLTRB(left, top, right, bottom); + if (p->getStyle() == SkPaint::kStrokeAndFill_Style) { + rect.outset(p->getStrokeWidth() / 2, p->getStrokeWidth() / 2); + } + path.addRect(rect); + drawConvexPath(path, p); + + return DrawGlInfo::kStatusDrew; } if (p->isAntiAlias() && !mSnapshot->transform->isSimple()) { diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index fdb6818d3912..b334bb32e43b 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -733,7 +733,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { if (streamType == STREAM_REMOTE_MUSIC) { // don't play sounds for remote - flags &= ~AudioManager.FLAG_PLAY_SOUND; + flags &= ~(AudioManager.FLAG_PLAY_SOUND|AudioManager.FLAG_FIXED_VOLUME); //if (DEBUG_VOL) Log.i(TAG, "Need to adjust remote volume: calling adjustRemoteVolume()"); adjustRemoteVolume(AudioSystem.STREAM_MUSIC, direction, flags); } else { @@ -771,6 +771,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { int index; int oldIndex; + flags &= ~AudioManager.FLAG_FIXED_VOLUME; if ((streamTypeAlias == AudioSystem.STREAM_MUSIC) && ((device & mFixedVolumeDevices) != 0)) { flags |= AudioManager.FLAG_FIXED_VOLUME; @@ -855,6 +856,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { final int device = getDeviceForStream(streamType); int oldIndex; + flags &= ~AudioManager.FLAG_FIXED_VOLUME; if ((mStreamVolumeAlias[streamType] == AudioSystem.STREAM_MUSIC) && ((device & mFixedVolumeDevices) != 0)) { flags |= AudioManager.FLAG_FIXED_VOLUME; @@ -1737,7 +1739,8 @@ public class AudioService extends IAudioService.Stub implements OnFinished { streamState.readSettings(); // unmute stream that was muted but is not affect by mute anymore - if (streamState.muteCount() != 0 && !isStreamAffectedByMute(streamType)) { + if (streamState.muteCount() != 0 && !isStreamAffectedByMute(streamType) && + !isStreamMutedByRingerMode(streamType)) { int size = streamState.mDeathHandlers.size(); for (int i = 0; i < size; i++) { streamState.mDeathHandlers.get(i).mMuteCount = 1; @@ -2591,6 +2594,18 @@ public class AudioService extends IAudioService.Stub implements OnFinished { public synchronized void readSettings() { int remainingDevices = AudioSystem.DEVICE_OUT_ALL; + // do not read system stream volume from settings: this stream is always aliased + // to another stream type and its volume is never persisted. Values in settings can + // only be stale values + if ((mStreamType == AudioSystem.STREAM_SYSTEM) || + (mStreamType == AudioSystem.STREAM_SYSTEM_ENFORCED)) { + mLastAudibleIndex.put(AudioSystem.DEVICE_OUT_DEFAULT, + 10 * AudioManager.DEFAULT_STREAM_VOLUME[mStreamType]); + mIndex.put(AudioSystem.DEVICE_OUT_DEFAULT, + 10 * AudioManager.DEFAULT_STREAM_VOLUME[mStreamType]); + return; + } + for (int i = 0; remainingDevices != 0; i++) { int device = (1 << i); if ((device & remainingDevices) == 0) { @@ -2621,11 +2636,8 @@ public class AudioService extends IAudioService.Stub implements OnFinished { // a last audible index of 0 should never be stored for ring and notification // streams on phones (voice capable devices). - // same for system stream on phones and tablets - if ((lastAudibleIndex == 0) && - ((mVoiceCapable && - (mStreamVolumeAlias[mStreamType] == AudioSystem.STREAM_RING)) || - (mStreamVolumeAlias[mStreamType] == AudioSystem.STREAM_SYSTEM))) { + if ((lastAudibleIndex == 0) && mVoiceCapable && + (mStreamVolumeAlias[mStreamType] == AudioSystem.STREAM_RING)) { lastAudibleIndex = AudioManager.DEFAULT_STREAM_VOLUME[mStreamType]; // Correct the data base sendMsg(mAudioHandler, @@ -2639,11 +2651,9 @@ public class AudioService extends IAudioService.Stub implements OnFinished { mLastAudibleIndex.put(device, getValidIndex(10 * lastAudibleIndex)); // the initial index should never be 0 for ring and notification streams on phones // (voice capable devices) if not in silent or vibrate mode. - // same for system stream on phones and tablets if ((index == 0) && (mRingerMode == AudioManager.RINGER_MODE_NORMAL) && - ((mVoiceCapable && - (mStreamVolumeAlias[mStreamType] == AudioSystem.STREAM_RING)) || - (mStreamVolumeAlias[mStreamType] == AudioSystem.STREAM_SYSTEM))) { + mVoiceCapable && + (mStreamVolumeAlias[mStreamType] == AudioSystem.STREAM_RING)) { index = lastAudibleIndex; // Correct the data base sendMsg(mAudioHandler, diff --git a/nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java b/nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java index 9c87c2244477..ffed80479662 100644 --- a/nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java +++ b/nfc-extras/java/com/android/nfc_extras/NfcAdapterExtras.java @@ -234,4 +234,21 @@ public final class NfcAdapterExtras { attemptDeadServiceRecovery(e); } } + + /** + * Returns the name of this adapter's driver. + * + * <p>Different NFC adapters may use different drivers. This value is + * informational and should not be parsed. + * + * @return the driver name, or empty string if unknown + */ + public String getDriverName() { + try { + return sService.getDriverName(mPackageName); + } catch (RemoteException e) { + attemptDeadServiceRecovery(e); + return ""; + } + } } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 2716b043f7bb..a9869d941821 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -68,7 +68,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { // database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion' // is properly propagated through your change. Not doing so will result in a loss of user // settings. - private static final int DATABASE_VERSION = 91; + private static final int DATABASE_VERSION = 92; private Context mContext; private int mUserHandle; @@ -1433,6 +1433,22 @@ public class DatabaseHelper extends SQLiteOpenHelper { upgradeVersion = 91; } + if (upgradeVersion == 91) { + if (mUserHandle == UserHandle.USER_OWNER) { + db.beginTransaction(); + try { + // Move ringer mode from system to global settings + String[] settingsToMove = { Settings.System.MODE_RINGER }; + moveSettingsToNewTable(db, TABLE_SYSTEM, TABLE_GLOBAL, settingsToMove, true); + + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + } + upgradeVersion = 92; + } + // *** Remember to update DATABASE_VERSION above! if (upgradeVersion != currentVersion) { @@ -1757,9 +1773,6 @@ public class DatabaseHelper extends SQLiteOpenHelper { Settings.System.VOLUME_BLUETOOTH_SCO, AudioManager.DEFAULT_STREAM_VOLUME[AudioManager.STREAM_BLUETOOTH_SCO]); - loadSetting(stmt, Settings.System.MODE_RINGER, - AudioManager.RINGER_MODE_NORMAL); - // By default: // - ringtones, notification, system and music streams are affected by ringer mode // on non voice capable devices (tablets) @@ -2049,6 +2062,9 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadIntegerSetting(stmt, Settings.Global.WIFI_SLEEP_POLICY, R.integer.def_wifi_sleep_policy); + loadSetting(stmt, Settings.Global.MODE_RINGER, + AudioManager.RINGER_MODE_NORMAL); + // --- Previously in 'secure' loadBooleanSetting(stmt, Settings.Global.PACKAGE_VERIFIER_ENABLE, R.bool.def_package_verifier_enable); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index 109654083987..ba7501b896cd 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -46,7 +46,6 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.io.Reader; import java.io.Writer; import java.util.ArrayList; import java.util.HashMap; @@ -64,25 +63,35 @@ public class SettingsBackupAgent extends BackupAgentHelper { private static final String KEY_SYSTEM = "system"; private static final String KEY_SECURE = "secure"; + private static final String KEY_GLOBAL = "global"; private static final String KEY_LOCALE = "locale"; - //Version 2 adds STATE_WIFI_CONFIG - private static final int STATE_VERSION_1 = 1; - private static final int STATE_VERSION_1_SIZE = 4; - // Versioning of the state file. Increment this version // number any time the set of state items is altered. - private static final int STATE_VERSION = 2; + private static final int STATE_VERSION = 3; + // Slots in the checksum array. Never insert new items in the middle + // of this array; new slots must be appended. private static final int STATE_SYSTEM = 0; private static final int STATE_SECURE = 1; private static final int STATE_LOCALE = 2; private static final int STATE_WIFI_SUPPLICANT = 3; private static final int STATE_WIFI_CONFIG = 4; - private static final int STATE_SIZE = 5; // The number of state items + private static final int STATE_GLOBAL = 5; + + private static final int STATE_SIZE = 6; // The current number of state items + + // Number of entries in the checksum array at various version numbers + private static final int STATE_SIZES[] = { + 0, + 4, // version 1 + 5, // version 2 added STATE_WIFI_CONFIG + STATE_SIZE // version 3 added STATE_GLOBAL + }; // Versioning of the 'full backup' format - private static final int FULL_BACKUP_VERSION = 1; + private static final int FULL_BACKUP_VERSION = 2; + private static final int FULL_BACKUP_ADDED_GLOBAL = 2; // added the "global" entry private static final int INTEGER_BYTE_COUNT = Integer.SIZE / Byte.SIZE; @@ -257,6 +266,7 @@ public class SettingsBackupAgent extends BackupAgentHelper { byte[] systemSettingsData = getSystemSettings(); byte[] secureSettingsData = getSecureSettings(); + byte[] globalSettingsData = getGlobalSettings(); byte[] locale = mSettingsHelper.getLocaleData(); byte[] wifiSupplicantData = getWifiSupplicant(FILE_WIFI_SUPPLICANT); byte[] wifiConfigData = getFileData(mWifiConfigFile); @@ -267,6 +277,8 @@ public class SettingsBackupAgent extends BackupAgentHelper { writeIfChanged(stateChecksums[STATE_SYSTEM], KEY_SYSTEM, systemSettingsData, data); stateChecksums[STATE_SECURE] = writeIfChanged(stateChecksums[STATE_SECURE], KEY_SECURE, secureSettingsData, data); + stateChecksums[STATE_GLOBAL] = + writeIfChanged(stateChecksums[STATE_GLOBAL], KEY_GLOBAL, secureSettingsData, data); stateChecksums[STATE_LOCALE] = writeIfChanged(stateChecksums[STATE_LOCALE], KEY_LOCALE, locale, data); stateChecksums[STATE_WIFI_SUPPLICANT] = @@ -283,14 +295,18 @@ public class SettingsBackupAgent extends BackupAgentHelper { public void onRestore(BackupDataInput data, int appVersionCode, ParcelFileDescriptor newState) throws IOException { + HashSet<String> movedToGlobal = new HashSet<String>(); + Settings.System.getMovedKeys(movedToGlobal); + Settings.Secure.getMovedKeys(movedToGlobal); + while (data.readNextHeader()) { final String key = data.getKey(); final int size = data.getDataSize(); if (KEY_SYSTEM.equals(key)) { - restoreSettings(data, Settings.System.CONTENT_URI); + restoreSettings(data, Settings.System.CONTENT_URI, movedToGlobal); mSettingsHelper.applyAudioSettings(); } else if (KEY_SECURE.equals(key)) { - restoreSettings(data, Settings.Secure.CONTENT_URI); + restoreSettings(data, Settings.Secure.CONTENT_URI, movedToGlobal); } else if (KEY_WIFI_SUPPLICANT.equals(key)) { int retainedWifiState = enableWifi(false); restoreWifiSupplicant(FILE_WIFI_SUPPLICANT, data); @@ -317,6 +333,7 @@ public class SettingsBackupAgent extends BackupAgentHelper { public void onFullBackup(FullBackupDataOutput data) throws IOException { byte[] systemSettingsData = getSystemSettings(); byte[] secureSettingsData = getSecureSettings(); + byte[] globalSettingsData = getGlobalSettings(); byte[] locale = mSettingsHelper.getLocaleData(); byte[] wifiSupplicantData = getWifiSupplicant(FILE_WIFI_SUPPLICANT); byte[] wifiConfigData = getFileData(mWifiConfigFile); @@ -339,6 +356,9 @@ public class SettingsBackupAgent extends BackupAgentHelper { if (DEBUG_BACKUP) Log.d(TAG, secureSettingsData.length + " bytes of secure settings data"); out.writeInt(secureSettingsData.length); out.write(secureSettingsData); + if (DEBUG_BACKUP) Log.d(TAG, globalSettingsData.length + " bytes of global settings data"); + out.writeInt(globalSettingsData.length); + out.write(globalSettingsData); if (DEBUG_BACKUP) Log.d(TAG, locale.length + " bytes of locale data"); out.writeInt(locale.length); out.write(locale); @@ -371,20 +391,35 @@ public class SettingsBackupAgent extends BackupAgentHelper { int version = in.readInt(); if (DEBUG_BACKUP) Log.d(TAG, "Flattened data version " + version); - if (version == FULL_BACKUP_VERSION) { + if (version <= FULL_BACKUP_VERSION) { + // Generate the moved-to-global lookup table + HashSet<String> movedToGlobal = new HashSet<String>(); + Settings.System.getMovedKeys(movedToGlobal); + Settings.Secure.getMovedKeys(movedToGlobal); + // system settings data first int nBytes = in.readInt(); if (DEBUG_BACKUP) Log.d(TAG, nBytes + " bytes of settings data"); byte[] buffer = new byte[nBytes]; in.readFully(buffer, 0, nBytes); - restoreSettings(buffer, nBytes, Settings.System.CONTENT_URI); + restoreSettings(buffer, nBytes, Settings.System.CONTENT_URI, movedToGlobal); // secure settings nBytes = in.readInt(); if (DEBUG_BACKUP) Log.d(TAG, nBytes + " bytes of secure settings data"); if (nBytes > buffer.length) buffer = new byte[nBytes]; in.readFully(buffer, 0, nBytes); - restoreSettings(buffer, nBytes, Settings.Secure.CONTENT_URI); + restoreSettings(buffer, nBytes, Settings.Secure.CONTENT_URI, movedToGlobal); + + // Global only if sufficiently new + if (version >= FULL_BACKUP_ADDED_GLOBAL) { + nBytes = in.readInt(); + if (DEBUG_BACKUP) Log.d(TAG, nBytes + " bytes of global settings data"); + if (nBytes > buffer.length) buffer = new byte[nBytes]; + in.readFully(buffer, 0, nBytes); + movedToGlobal.clear(); // no redirection; this *is* the global namespace + restoreSettings(buffer, nBytes, Settings.Global.CONTENT_URI, movedToGlobal); + } // locale nBytes = in.readInt(); @@ -430,14 +465,8 @@ public class SettingsBackupAgent extends BackupAgentHelper { try { int stateVersion = dataInput.readInt(); - if (stateVersion == STATE_VERSION_1) { - for (int i = 0; i < STATE_VERSION_1_SIZE; i++) { - stateChecksums[i] = dataInput.readLong(); - } - } else if (stateVersion == STATE_VERSION) { - for (int i = 0; i < STATE_SIZE; i++) { - stateChecksums[i] = dataInput.readLong(); - } + for (int i = 0; i < STATE_SIZES[stateVersion]; i++) { + stateChecksums[i] = dataInput.readLong(); } } catch (EOFException eof) { // With the default 0 checksum we'll wind up forcing a backup of @@ -496,7 +525,18 @@ public class SettingsBackupAgent extends BackupAgentHelper { } } - private void restoreSettings(BackupDataInput data, Uri contentUri) { + private byte[] getGlobalSettings() { + Cursor cursor = getContentResolver().query(Settings.Global.CONTENT_URI, PROJECTION, null, + null, null); + try { + return extractRelevantValues(cursor, Settings.Global.SETTINGS_TO_BACKUP); + } finally { + cursor.close(); + } + } + + private void restoreSettings(BackupDataInput data, Uri contentUri, + HashSet<String> movedToGlobal) { byte[] settings = new byte[data.getDataSize()]; try { data.readEntityData(settings, 0, settings.length); @@ -504,20 +544,23 @@ public class SettingsBackupAgent extends BackupAgentHelper { Log.e(TAG, "Couldn't read entity data"); return; } - restoreSettings(settings, settings.length, contentUri); + restoreSettings(settings, settings.length, contentUri, movedToGlobal); } - private void restoreSettings(byte[] settings, int bytes, Uri contentUri) { + private void restoreSettings(byte[] settings, int bytes, Uri contentUri, + HashSet<String> movedToGlobal) { if (DEBUG) { Log.i(TAG, "restoreSettings: " + contentUri); } - // Figure out the white list. + // Figure out the white list and redirects to the global table. String[] whitelist = null; if (contentUri.equals(Settings.Secure.CONTENT_URI)) { whitelist = Settings.Secure.SETTINGS_TO_BACKUP; } else if (contentUri.equals(Settings.System.CONTENT_URI)) { whitelist = Settings.System.SETTINGS_TO_BACKUP; + } else if (contentUri.equals(Settings.Global.CONTENT_URI)) { + whitelist = Settings.Global.SETTINGS_TO_BACKUP; } else { throw new IllegalArgumentException("Unknown URI: " + contentUri); } @@ -556,15 +599,20 @@ public class SettingsBackupAgent extends BackupAgentHelper { continue; } + final Uri destination = (movedToGlobal.contains(key)) + ? Settings.Global.CONTENT_URI + : contentUri; + + // The helper doesn't care what namespace the keys are in if (settingsHelper.restoreValue(key, value)) { contentValues.clear(); contentValues.put(Settings.NameValueTable.NAME, key); contentValues.put(Settings.NameValueTable.VALUE, value); - getContentResolver().insert(contentUri, contentValues); + getContentResolver().insert(destination, contentValues); } if (DEBUG || true) { - Log.d(TAG, "Restored setting: " + key + "=" + value); + Log.d(TAG, "Restored setting: " + destination + " : "+ key + "=" + value); } } } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index cc6656d0ad2b..1701f6e69e36 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -33,6 +33,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; import android.content.res.AssetFileDescriptor; +import android.database.AbstractCursor; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteException; @@ -110,158 +111,12 @@ public class SettingsProvider extends ContentProvider { // table, shared across all users // These must match Settings.Secure.MOVED_TO_GLOBAL sSecureGlobalKeys = new HashSet<String>(); - sSecureGlobalKeys.add(Settings.Global.ADB_ENABLED); - sSecureGlobalKeys.add(Settings.Global.ASSISTED_GPS_ENABLED); - sSecureGlobalKeys.add(Settings.Global.BLUETOOTH_ON); - sSecureGlobalKeys.add(Settings.Global.CDMA_CELL_BROADCAST_SMS); - sSecureGlobalKeys.add(Settings.Global.CDMA_ROAMING_MODE); - sSecureGlobalKeys.add(Settings.Global.CDMA_SUBSCRIPTION_MODE); - sSecureGlobalKeys.add(Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE); - sSecureGlobalKeys.add(Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI); - sSecureGlobalKeys.add(Settings.Global.DATA_ROAMING); - sSecureGlobalKeys.add(Settings.Global.DEVELOPMENT_SETTINGS_ENABLED); - sSecureGlobalKeys.add(Settings.Global.DEVICE_PROVISIONED); - sSecureGlobalKeys.add(Settings.Global.DISPLAY_DENSITY_FORCED); - sSecureGlobalKeys.add(Settings.Global.DISPLAY_SIZE_FORCED); - sSecureGlobalKeys.add(Settings.Global.DOWNLOAD_MAX_BYTES_OVER_MOBILE); - sSecureGlobalKeys.add(Settings.Global.DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE); - sSecureGlobalKeys.add(Settings.Global.INSTALL_NON_MARKET_APPS); - sSecureGlobalKeys.add(Settings.Global.MOBILE_DATA); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_DEV_BUCKET_DURATION); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_DEV_DELETE_AGE); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_DEV_PERSIST_BYTES); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_DEV_ROTATE_AGE); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_ENABLED); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_GLOBAL_ALERT_BYTES); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_POLL_INTERVAL); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_REPORT_XT_OVER_DEV); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_SAMPLE_ENABLED); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_TIME_CACHE_MAX_AGE); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_BUCKET_DURATION); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_DELETE_AGE); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_PERSIST_BYTES); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_ROTATE_AGE); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_TAG_BUCKET_DURATION); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_TAG_DELETE_AGE); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_TAG_PERSIST_BYTES); - sSecureGlobalKeys.add(Settings.Global.NETSTATS_UID_TAG_ROTATE_AGE); - sSecureGlobalKeys.add(Settings.Global.NETWORK_PREFERENCE); - sSecureGlobalKeys.add(Settings.Global.NITZ_UPDATE_DIFF); - sSecureGlobalKeys.add(Settings.Global.NITZ_UPDATE_SPACING); - sSecureGlobalKeys.add(Settings.Global.NTP_SERVER); - sSecureGlobalKeys.add(Settings.Global.NTP_TIMEOUT); - sSecureGlobalKeys.add(Settings.Global.PDP_WATCHDOG_ERROR_POLL_COUNT); - sSecureGlobalKeys.add(Settings.Global.PDP_WATCHDOG_LONG_POLL_INTERVAL_MS); - sSecureGlobalKeys.add(Settings.Global.PDP_WATCHDOG_MAX_PDP_RESET_FAIL_COUNT); - sSecureGlobalKeys.add(Settings.Global.PDP_WATCHDOG_POLL_INTERVAL_MS); - sSecureGlobalKeys.add(Settings.Global.PDP_WATCHDOG_TRIGGER_PACKET_COUNT); - sSecureGlobalKeys.add(Settings.Global.SAMPLING_PROFILER_MS); - sSecureGlobalKeys.add(Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL); - sSecureGlobalKeys.add(Settings.Global.SETUP_PREPAID_DETECTION_REDIR_HOST); - sSecureGlobalKeys.add(Settings.Global.SETUP_PREPAID_DETECTION_TARGET_URL); - sSecureGlobalKeys.add(Settings.Global.TETHER_DUN_APN); - sSecureGlobalKeys.add(Settings.Global.TETHER_DUN_REQUIRED); - sSecureGlobalKeys.add(Settings.Global.TETHER_SUPPORTED); - sSecureGlobalKeys.add(Settings.Global.THROTTLE_HELP_URI); - sSecureGlobalKeys.add(Settings.Global.THROTTLE_MAX_NTP_CACHE_AGE_SEC); - sSecureGlobalKeys.add(Settings.Global.THROTTLE_NOTIFICATION_TYPE); - sSecureGlobalKeys.add(Settings.Global.THROTTLE_POLLING_SEC); - sSecureGlobalKeys.add(Settings.Global.THROTTLE_RESET_DAY); - sSecureGlobalKeys.add(Settings.Global.THROTTLE_THRESHOLD_BYTES); - sSecureGlobalKeys.add(Settings.Global.THROTTLE_VALUE_KBITSPS); - sSecureGlobalKeys.add(Settings.Global.USB_MASS_STORAGE_ENABLED); - sSecureGlobalKeys.add(Settings.Global.USE_GOOGLE_MAIL); - sSecureGlobalKeys.add(Settings.Global.WEB_AUTOFILL_QUERY_URL); - sSecureGlobalKeys.add(Settings.Global.WIFI_COUNTRY_CODE); - sSecureGlobalKeys.add(Settings.Global.WIFI_FRAMEWORK_SCAN_INTERVAL_MS); - sSecureGlobalKeys.add(Settings.Global.WIFI_FREQUENCY_BAND); - sSecureGlobalKeys.add(Settings.Global.WIFI_IDLE_MS); - sSecureGlobalKeys.add(Settings.Global.WIFI_MAX_DHCP_RETRY_COUNT); - sSecureGlobalKeys.add(Settings.Global.WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS); - sSecureGlobalKeys.add(Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON); - sSecureGlobalKeys.add(Settings.Global.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY); - sSecureGlobalKeys.add(Settings.Global.WIFI_NUM_OPEN_NETWORKS_KEPT); - sSecureGlobalKeys.add(Settings.Global.WIFI_ON); - sSecureGlobalKeys.add(Settings.Global.WIFI_P2P_DEVICE_NAME); - sSecureGlobalKeys.add(Settings.Global.WIFI_SAVED_STATE); - sSecureGlobalKeys.add(Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS); - sSecureGlobalKeys.add(Settings.Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED); - sSecureGlobalKeys.add(Settings.Global.WIFI_WATCHDOG_ON); - sSecureGlobalKeys.add(Settings.Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED); - sSecureGlobalKeys.add(Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON); - sSecureGlobalKeys.add(Settings.Global.PACKAGE_VERIFIER_ENABLE); - sSecureGlobalKeys.add(Settings.Global.PACKAGE_VERIFIER_TIMEOUT); - sSecureGlobalKeys.add(Settings.Global.PACKAGE_VERIFIER_DEFAULT_RESPONSE); - sSecureGlobalKeys.add(Settings.Global.DATA_STALL_ALARM_NON_AGGRESSIVE_DELAY_IN_MS); - sSecureGlobalKeys.add(Settings.Global.DATA_STALL_ALARM_AGGRESSIVE_DELAY_IN_MS); - sSecureGlobalKeys.add(Settings.Global.GPRS_REGISTER_CHECK_PERIOD_MS); - sSecureGlobalKeys.add(Settings.Global.WTF_IS_FATAL); - sSecureGlobalKeys.add(Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD); - sSecureGlobalKeys.add(Settings.Global.BATTERY_DISCHARGE_THRESHOLD); - sSecureGlobalKeys.add(Settings.Global.SEND_ACTION_APP_ERROR); - sSecureGlobalKeys.add(Settings.Global.DROPBOX_AGE_SECONDS); - sSecureGlobalKeys.add(Settings.Global.DROPBOX_MAX_FILES); - sSecureGlobalKeys.add(Settings.Global.DROPBOX_QUOTA_KB); - sSecureGlobalKeys.add(Settings.Global.DROPBOX_QUOTA_PERCENT); - sSecureGlobalKeys.add(Settings.Global.DROPBOX_RESERVE_PERCENT); - sSecureGlobalKeys.add(Settings.Global.DROPBOX_TAG_PREFIX); - sSecureGlobalKeys.add(Settings.Global.ERROR_LOGCAT_PREFIX); - sSecureGlobalKeys.add(Settings.Global.SYS_FREE_STORAGE_LOG_INTERVAL); - sSecureGlobalKeys.add(Settings.Global.DISK_FREE_CHANGE_REPORTING_THRESHOLD); - sSecureGlobalKeys.add(Settings.Global.SYS_STORAGE_THRESHOLD_PERCENTAGE); - sSecureGlobalKeys.add(Settings.Global.SYS_STORAGE_THRESHOLD_MAX_BYTES); - sSecureGlobalKeys.add(Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES); - sSecureGlobalKeys.add(Settings.Global.SYNC_MAX_RETRY_DELAY_IN_SECONDS); - sSecureGlobalKeys.add(Settings.Global.CONNECTIVITY_CHANGE_DELAY); - sSecureGlobalKeys.add(Settings.Global.CAPTIVE_PORTAL_DETECTION_ENABLED); - sSecureGlobalKeys.add(Settings.Global.CAPTIVE_PORTAL_SERVER); - sSecureGlobalKeys.add(Settings.Global.NSD_ON); - sSecureGlobalKeys.add(Settings.Global.SET_INSTALL_LOCATION); - sSecureGlobalKeys.add(Settings.Global.DEFAULT_INSTALL_LOCATION); - sSecureGlobalKeys.add(Settings.Global.INET_CONDITION_DEBOUNCE_UP_DELAY); - sSecureGlobalKeys.add(Settings.Global.INET_CONDITION_DEBOUNCE_DOWN_DELAY); - sSecureGlobalKeys.add(Settings.Global.READ_EXTERNAL_STORAGE_ENFORCED_DEFAULT); - sSecureGlobalKeys.add(Settings.Global.HTTP_PROXY); - sSecureGlobalKeys.add(Settings.Global.GLOBAL_HTTP_PROXY_HOST); - sSecureGlobalKeys.add(Settings.Global.GLOBAL_HTTP_PROXY_PORT); - sSecureGlobalKeys.add(Settings.Global.GLOBAL_HTTP_PROXY_EXCLUSION_LIST); - sSecureGlobalKeys.add(Settings.Global.SET_GLOBAL_HTTP_PROXY); - sSecureGlobalKeys.add(Settings.Global.DEFAULT_DNS_SERVER); - sSecureGlobalKeys.add(Settings.Global.PREFERRED_NETWORK_MODE); - sSecureGlobalKeys.add(Settings.Global.PREFERRED_CDMA_SUBSCRIPTION); + Settings.Secure.getMovedKeys(sSecureGlobalKeys); // Keys from the 'system' table now moved to 'global' // These must match Settings.System.MOVED_TO_GLOBAL sSystemGlobalKeys = new HashSet<String>(); - - sSystemGlobalKeys.add(Settings.Global.AIRPLANE_MODE_ON); - sSystemGlobalKeys.add(Settings.Global.AIRPLANE_MODE_RADIOS); - sSystemGlobalKeys.add(Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS); - sSystemGlobalKeys.add(Settings.Global.AUTO_TIME); - sSystemGlobalKeys.add(Settings.Global.AUTO_TIME_ZONE); - sSystemGlobalKeys.add(Settings.Global.CAR_DOCK_SOUND); - sSystemGlobalKeys.add(Settings.Global.CAR_UNDOCK_SOUND); - sSystemGlobalKeys.add(Settings.Global.DESK_DOCK_SOUND); - sSystemGlobalKeys.add(Settings.Global.DESK_UNDOCK_SOUND); - sSystemGlobalKeys.add(Settings.Global.DOCK_SOUNDS_ENABLED); - sSystemGlobalKeys.add(Settings.Global.LOCK_SOUND); - sSystemGlobalKeys.add(Settings.Global.UNLOCK_SOUND); - sSystemGlobalKeys.add(Settings.Global.LOW_BATTERY_SOUND); - sSystemGlobalKeys.add(Settings.Global.POWER_SOUNDS_ENABLED); - sSystemGlobalKeys.add(Settings.Global.STAY_ON_WHILE_PLUGGED_IN); - sSystemGlobalKeys.add(Settings.Global.WIFI_SLEEP_POLICY); - sSystemGlobalKeys.add(Settings.Global.MODE_RINGER); - sSystemGlobalKeys.add(Settings.Global.WINDOW_ANIMATION_SCALE); - sSystemGlobalKeys.add(Settings.Global.TRANSITION_ANIMATION_SCALE); - sSystemGlobalKeys.add(Settings.Global.ANIMATOR_DURATION_SCALE); - sSystemGlobalKeys.add(Settings.Global.FANCY_IME_ANIMATIONS); - sSystemGlobalKeys.add(Settings.Global.COMPATIBILITY_MODE); - sSystemGlobalKeys.add(Settings.Global.EMERGENCY_TONE); - sSystemGlobalKeys.add(Settings.Global.CALL_AUTO_RETRY); - sSystemGlobalKeys.add(Settings.Global.DEBUG_APP); - sSystemGlobalKeys.add(Settings.Global.WAIT_FOR_DEBUGGER); - sSystemGlobalKeys.add(Settings.Global.SHOW_PROCESSES); - sSystemGlobalKeys.add(Settings.Global.ALWAYS_FINISH_ACTIVITIES); + Settings.System.getNonLegacyMovedKeys(sSystemGlobalKeys); } private boolean settingMovedToGlobal(final String name) { @@ -280,6 +135,7 @@ public class SettingsProvider extends ContentProvider { /** Operate on existing rows. */ SqlArguments(Uri url, String where, String[] args) { if (url.getPathSegments().size() == 1) { + // of the form content://settings/secure, arbitrary where clause this.table = url.getPathSegments().get(0); if (!DatabaseHelper.isValidTable(this.table)) { throw new IllegalArgumentException("Bad root path: " + this.table); @@ -291,6 +147,7 @@ public class SettingsProvider extends ContentProvider { } else if (!TextUtils.isEmpty(where)) { throw new UnsupportedOperationException("WHERE clause not supported: " + url); } else { + // of the form content://settings/secure/element_name, no where clause this.table = url.getPathSegments().get(0); if (!DatabaseHelper.isValidTable(this.table)) { throw new IllegalArgumentException("Bad root path: " + this.table); @@ -298,8 +155,16 @@ public class SettingsProvider extends ContentProvider { if (TABLE_SYSTEM.equals(this.table) || TABLE_SECURE.equals(this.table) || TABLE_GLOBAL.equals(this.table)) { this.where = Settings.NameValueTable.NAME + "=?"; - this.args = new String[] { url.getPathSegments().get(1) }; + final String name = url.getPathSegments().get(1); + this.args = new String[] { name }; + // Rewrite the table for known-migrated names + if (TABLE_SYSTEM.equals(this.table) || TABLE_SECURE.equals(this.table)) { + if (sSecureGlobalKeys.contains(name) || sSystemGlobalKeys.contains(name)) { + this.table = TABLE_GLOBAL; + } + } } else { + // of the form content://bookmarks/19 this.where = "_id=" + ContentUris.parseId(url); this.args = null; } @@ -831,7 +696,16 @@ public class SettingsProvider extends ContentProvider { qb.setTables(args.table); Cursor ret = qb.query(db, select, args.where, args.args, null, null, sort); - ret.setNotificationUri(getContext().getContentResolver(), url); + // the default Cursor interface does not support per-user observation + try { + AbstractCursor c = (AbstractCursor) ret; + c.setNotificationUri(getContext().getContentResolver(), url, forUser); + } catch (ClassCastException e) { + // details of the concrete Cursor implementation have changed and this code has + // not been updated to match -- complain and fail hard. + Log.wtf(TAG, "Incompatible cursor derivation!"); + throw e; + } return ret; } @@ -984,6 +858,17 @@ public class SettingsProvider extends ContentProvider { if (!parseProviderList(url, initialValues)) return null; } + // If this is an insert() of a key that has been migrated to the global store, + // redirect the operation to that store + if (name != null) { + if (sSecureGlobalKeys.contains(name) || sSystemGlobalKeys.contains(name)) { + if (!TABLE_GLOBAL.equals(args.table)) { + if (LOCAL_LOGV) Slog.i(TAG, "Rewrite of insert() of now-global key " + name); + } + args.table = TABLE_GLOBAL; // next condition will rewrite the user handle + } + } + // The global table is stored under the owner, always if (TABLE_GLOBAL.equals(args.table)) { desiredUserHandle = UserHandle.USER_OWNER; diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 3b40fba01a25..cdf30b30c305 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -210,10 +210,12 @@ android:exported="true" android:excludeFromRecents="true" > + <!-- <intent-filter> <action android:name="android.intent.action.CREATE_SHORTCUT" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + --> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_not_connected.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_not_connected.png Binary files differnew file mode 100644 index 000000000000..8fb71ba74901 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_not_connected.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_off.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_off.png Binary files differindex 7c6ca7534d81..ac7653594568 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_off.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_off.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_on.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_on.png Binary files differindex ff0ba07cde09..090d235d7911 100644 --- a/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_on.png +++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_bluetooth_on.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_not_connected.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_not_connected.png Binary files differnew file mode 100644 index 000000000000..d0ce4f6fdddf --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_not_connected.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_off.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_off.png Binary files differindex 61eff946df08..2116449fb52c 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_off.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_off.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_on.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_on.png Binary files differindex b480a80bc638..1cc6e62f2029 100644 --- a/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_on.png +++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_bluetooth_on.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_not_connected.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_not_connected.png Binary files differnew file mode 100644 index 000000000000..e312f8e9e7d1 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_not_connected.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_off.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_off.png Binary files differindex b4d9175a7a76..44cd31b347cd 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_off.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_off.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_on.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_on.png Binary files differindex 598d9676cb6b..62a518a9ecaf 100644 --- a/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_on.png +++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_bluetooth_on.png diff --git a/packages/SystemUI/res/layout/quick_settings.xml b/packages/SystemUI/res/layout/quick_settings.xml index c1bcdfe0a434..d119cf570702 100644 --- a/packages/SystemUI/res/layout/quick_settings.xml +++ b/packages/SystemUI/res/layout/quick_settings.xml @@ -22,10 +22,11 @@ android:background="@drawable/notification_panel_bg" > <!-- TODO: Put into ScrollView --> - <ScrollView + <com.android.systemui.statusbar.phone.QuickSettingsScrollView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/close_handle_underlap" + android:overScrollMode="ifContentScrolls" > <com.android.systemui.statusbar.phone.QuickSettingsContainerView android:id="@+id/quick_settings_container" @@ -34,7 +35,7 @@ android:animateLayoutChanges="true" android:columnCount="@integer/quick_settings_num_columns" /> - </ScrollView> + </com.android.systemui.statusbar.phone.QuickSettingsScrollView> <View android:id="@+id/handle" diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml index 7f6098aecbd7..db25c1ad4fd0 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded.xml @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fadingEdge="none" - android:overScrollMode="always" + android:overScrollMode="ifContentScrolls" > <com.android.systemui.statusbar.policy.NotificationRowLayout android:id="@+id/latestItems" diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index fe81191b4240..5fe899696f92 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -149,7 +149,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Skerm is in landskapsoriëntasie gesluit."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Skerm is in portretoriëntasie gesluit."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Begin drome"</string> + <string name="start_dreams" msgid="6170089063982549905">"Slaap nou"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Vliegtuigmodus"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Laai, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> @@ -173,7 +173,7 @@ <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"Geen netwerk nie"</string> <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi af"</string> <string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"Wi-Fi-skerm"</string> - <string name="quick_settings_wifi_display_no_connection_label" msgid="7834964244709912066">"Geen Wi-Fi-skerm-verbinding nie"</string> + <string name="quick_settings_wifi_display_no_connection_label" msgid="7834964244709912066">"Geen Wi-Fi-skermverbinding nie"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Helderheid"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"OUTO"</string> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index e54dd95c41ee..a1047a7037b6 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -149,7 +149,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"ማያ ገጽ በወርድ ገፅ አቀማመጥ ተቆልፏል።"</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"ማያ ገጽ በቁም ገፅ አቀማመጥ ተቆልፏል።"</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"ህልሞችን ጀምር"</string> + <string name="start_dreams" msgid="6170089063982549905">"አሁን ተኛ"</string> <string name="ethernet_label" msgid="7967563676324087464">"ኤተርኔት"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"የአውሮፕላን ሁነታ"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"ባትሪ በመሙላት ላይ፣ <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index e3cd59e6e555..feb089ae3706 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -149,7 +149,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"تم تأمين الشاشة في الاتجاه الأفقي."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"تم تأمين الشاشة في الاتجاه العمودي."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"بدء Dreams"</string> + <string name="start_dreams" msgid="6170089063982549905">"السكون الآن"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"وضع الطائرة"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"جارٍ الشحن، <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml index dd8baa9c48e5..7f959afce5a4 100644 --- a/packages/SystemUI/res/values-be/strings.xml +++ b/packages/SystemUI/res/values-be/strings.xml @@ -151,7 +151,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Экран заблакiраваны ў альбомнай арыентацыі."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Экран заблакiраваны ў партрэтнай арыентацыі."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Пачаць мары"</string> + <string name="start_dreams" msgid="6170089063982549905">"Засыпай"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Рэжым палёту"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Зарадка, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index a3c30e84a547..cf5cc6dade42 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Екранът е заключен в хоризонтална ориентация."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Екранът е заключен във вертикална ориентация."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Начало на „Сънища“"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Самолетен режим"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Зарежда се, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 7dcbabf100a6..d677aed98a8e 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -151,7 +151,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"La pantalla està bloquejada en orientació horitzontal."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"La pantalla està bloquejada en orientació vertical."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Comença l\'Estalvi de pantalla interactiu"</string> + <string name="start_dreams" msgid="6170089063982549905">"Entra en mode repòs"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Mode d\'avió"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"S\'està carregant, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index c08050a710be..2a9ccb1680d1 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -151,7 +151,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Obrazovka je uzamčena v orientaci na šířku."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Obrazovka je uzamčena v orientaci na výšku."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Spustit sny"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Režim V letadle"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Nabíjení, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index e2f0d446ff67..5f4890a9c28c 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Skærmen er nu låst i liggende retning."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Skærmen er nu låst i stående retning."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Start Dreams"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Flytilstand"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Oplader, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index d3069e6d4eab..ccd22b605f53 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -151,7 +151,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Bildschirm bleibt im Querformat."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Bildschirm bleibt im Hochformat."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Dream-Funktion starten"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Flugmodus"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Akku wird aufgeladen (<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>)"</string> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index a72ae498e30a..e26f106ed85b 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -151,7 +151,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Η οθόνη έχει κλειδωθεί σε οριζόντιο προσανατολισμό."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Η οθόνη έχει κλειδωθεί σε κατακόρυφο προσανατολισμό."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Ενεργ. λειτ. dreams"</string> + <string name="start_dreams" msgid="6170089063982549905">"Ενεργ. αναστ. λειτ."</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Λειτουργία πτήσης"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Φόρτιση, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 9f03bfc01bb6..7fd4e437a6d8 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -149,7 +149,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Screen is locked in landscape orientation."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Screen is locked in portrait orientation."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Start dreams"</string> + <string name="start_dreams" msgid="6170089063982549905">"Sleep Now"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Aeroplane mode"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Charging, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 1bccbbc60815..860e6be264e5 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -151,7 +151,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"La pantalla está bloqueada en modo horizontal."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"La pantalla está bloqueada en modo vertical."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Iniciar Dreams"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Modo de avión"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Cargando (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> @@ -166,16 +167,16 @@ <string name="quick_settings_location_label" msgid="3292451598267467545">"Ubicación en uso"</string> <string name="quick_settings_media_device_label" msgid="1302906836372603762">"Dispositivo multimedia"</string> <string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string> - <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"Solo llamadas de emergencia"</string> + <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"Solo emergencia"</string> <string name="quick_settings_settings_label" msgid="5326556592578065401">"Configuración"</string> <string name="quick_settings_time_label" msgid="4635969182239736408">"Hora"</string> <string name="quick_settings_user_label" msgid="5238995632130897840">"Yo"</string> - <string name="quick_settings_wifi_label" msgid="9135344704899546041">"Tecnología Wi-Fi"</string> + <string name="quick_settings_wifi_label" msgid="9135344704899546041">"Wi-Fi"</string> <string name="quick_settings_wifi_not_connected" msgid="7171904845345573431">"Sin conexión"</string> <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"Sin red"</string> - <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Tecnología Wi-Fi desactivada"</string> - <string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"Wi-Fi Display"</string> - <string name="quick_settings_wifi_display_no_connection_label" msgid="7834964244709912066">"Sin conexión con la tecnología Wi-Fi Display"</string> + <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi desactivada"</string> + <string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"Pantalla Wi-Fi"</string> + <string name="quick_settings_wifi_display_no_connection_label" msgid="7834964244709912066">"Sin conexión con la pantalla Wi-Fi"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Brillo"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTOMÁTICO"</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index 79d682d5da7d..c21b780d438b 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"La pantalla está bloqueada en modo horizontal."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"La pantalla está bloqueada en modo vertical."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Iniciar Dreams"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Modo avión"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Cargando (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml index ce1c578c5944..3617714a418c 100644 --- a/packages/SystemUI/res/values-et/strings.xml +++ b/packages/SystemUI/res/values-et/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Ekraan on lukustatud horisontaalsuunas."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Ekraan on lukustatud vertikaalsuunas."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Käivita unerežiim"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Lennurežiim"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Laadimine, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index 47c5140c1fbc..c930243ccb72 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"صفحه اکنون در جهت افقی قفل است."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"صفحه اکنون در جهت عمودی قفل است."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"شروع رؤیاها"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"اترنت"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"حالت هواپیما"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"در حال شارژ، <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index ff93234bdbdc..44988d7f4702 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Ruutu on lukittu vaakasuuntaan."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Ruutu on lukittu pystysuuntaan."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Aloita unelmointi"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Lentokonetila"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Ladataan (<xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>)"</string> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 55fd6cd4f8da..8a484b1606db 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -151,7 +151,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"L\'écran est verrouillé en mode paysage."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"L\'écran est verrouillé en mode portrait."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Lancer fonct. Rêves"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Mode avion"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"En charge (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> @@ -160,7 +161,7 @@ <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"Bluetooth (<xliff:g id="NUMBER">%d</xliff:g> appareils)"</string> <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth désactivé"</string> <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Luminosité"</string> - <string name="quick_settings_rotation_unlocked_label" msgid="336054930362580584">"Rotation automatique"</string> + <string name="quick_settings_rotation_unlocked_label" msgid="336054930362580584">"Rotation auto."</string> <string name="quick_settings_rotation_locked_label" msgid="8058646447242565486">"Rotation verrouillée"</string> <string name="quick_settings_ime_label" msgid="7073463064369468429">"Mode de saisie"</string> <string name="quick_settings_location_label" msgid="3292451598267467545">"Utilisation des données de localisation"</string> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index eb9263a3b89e..0859a3cee20c 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"स्क्रीन लैंडस्केप अभिविन्यास में लॉक है."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"स्क्रीन पोर्ट्रेट अभिविन्यास में लॉक है."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"dreams प्रारंभ करें"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"ईथरनेट"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"हवाई जहाज़ मोड"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"चार्ज हो रही है, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 50384abeacbd..273f910302b4 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Zaslon je zaključan u pejzažnoj orijentaciji."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Zaslon je zaključan u portretnoj orijentaciji."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Počni sanjati"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Način rada u zrakoplovu"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Puni se, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 648869487be7..4a2e88d6b82d 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"A képernyő zárolva van fekvő tájolásban."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"A képernyő zárolva van álló tájolásban."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Álmok indítása"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Repülőgép üzemmód"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Töltés (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index d95534a2ccd8..4836598f30a0 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Layar dikunci dalam orientasi lanskap."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Layar dikunci dalam orientasi potret."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Mulai mimpi"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Mode pesawat"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Mengisi baterai, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 92bd9c60b15c..d811d18f21e5 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -151,7 +151,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Lo schermo è bloccato in orientamento orizzontale."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Lo schermo è bloccato in orientamento verticale."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Avvia Dreams"</string> + <string name="start_dreams" msgid="6170089063982549905">"Sospendi ora"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Modalità aereo"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"In carica (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 563089efb9fc..da9ae77b2078 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -149,7 +149,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"המסך נעול כעת לרוחב."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"המסך נעול כעת לאורך."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"הפעל את Dreams"</string> + <string name="start_dreams" msgid="6170089063982549905">"עבור לשינה עכשיו"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"מצב טיסה"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"טוען (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 71fb605fd553..508c406aee38 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -151,7 +151,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"画面は横向きにロックされています。"</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"画面は縦向きにロックされています。"</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"スクリーンセーバー起動"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"イーサネット"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"機内モード"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"充電中: <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 2eca801d43a3..95614b6c335f 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"화면이 가로 방향으로 잠겨 있습니다."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"화면이 세로 방향으로 잠겨 있습니다."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"스크린 세이버 시작"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"이더넷"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"비행기 모드"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"충전 중(<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 56961afa4c1b..d5c3cf63c8da 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Užrakintas ekranas yra horizontalios orientacijos."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Užrakintas ekranas yra vertikalios orientacijos."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Paleisti vizijas"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Eternetas"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Lėktuvo režimas"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Įkraunama, <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index dce9e0d1f410..32b503107a45 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Ekrāns tagad ir bloķēts ainavas orientācijā."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Ekrāns tagad ir bloķēts portreta orientācijā."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Palaist Dreams"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Tīkls Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Lidojuma režīms"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Notiek uzlāde, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml index cb6740984e16..65611159a328 100644 --- a/packages/SystemUI/res/values-ms/strings.xml +++ b/packages/SystemUI/res/values-ms/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Skrin dikunci dalam orientasi landskap."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Skrin dikunci dalam orientasi potret."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Mulakan mimpi"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Mod kapal terbang"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Mengecas, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index f74383e72c33..65c60abe944f 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -149,7 +149,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Skjermen er låst i liggende retning."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Skjermen er låst i stående retning."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Start drømmemodus"</string> + <string name="start_dreams" msgid="6170089063982549905">"Aktiver hvilemodus"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Flymodus"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Lader: <xliff:g id="NUMBER">%d</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index bca7e5c91ac5..2937b339f216 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -149,7 +149,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Het scherm is nu vergrendeld in liggende stand."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Het scherm is nu vergrendeld in staande stand."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Dromen starten"</string> + <string name="start_dreams" msgid="6170089063982549905">"Nu slapen"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Vliegmodus"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Opladen, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 0a24e08d3587..0e64e26bd3ad 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -149,14 +149,15 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Ekran jest zablokowany w orientacji poziomej."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Ekran jest zablokowany w orientacji pionowej."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Włącz wygaszacz"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Tryb samolotowy"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Ładowanie (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="quick_settings_battery_charged_label" msgid="8865413079414246081">"Naładowana"</string> <string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"Bluetooth"</string> <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"Bluetooth (urządzenia: <xliff:g id="NUMBER">%d</xliff:g>)"</string> - <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth wyłączony"</string> + <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth wył."</string> <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Jasność"</string> <string name="quick_settings_rotation_unlocked_label" msgid="336054930362580584">"Autoobracanie"</string> <string name="quick_settings_rotation_locked_label" msgid="8058646447242565486">"Obracanie jest zablokowane"</string> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index cffccc4fba1b..0ea0963e58d7 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -149,16 +149,16 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"O ecrã está bloqueado na orientação horizontal."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"O ecrã está bloqueado na orientação vertical."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Iniciar sonhos"</string> + <string name="start_dreams" msgid="6170089063982549905">"Em Suspensão Agora"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Modo de avião"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"A carregar, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> <string name="quick_settings_battery_charged_label" msgid="8865413079414246081">"Carregada"</string> <string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"Bluetooth"</string> <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"Bluetooth (<xliff:g id="NUMBER">%d</xliff:g> Dispositivos)"</string> - <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth Desativado"</string> + <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth Desat."</string> <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brilho"</string> - <string name="quick_settings_rotation_unlocked_label" msgid="336054930362580584">"Rodar Automaticamente"</string> + <string name="quick_settings_rotation_unlocked_label" msgid="336054930362580584">"Rodar Automat."</string> <string name="quick_settings_rotation_locked_label" msgid="8058646447242565486">"Rotação Bloqueada"</string> <string name="quick_settings_ime_label" msgid="7073463064369468429">"Método de Introdução"</string> <string name="quick_settings_location_label" msgid="3292451598267467545">"Localização em utilização"</string> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 8730f80cda57..445acbf61e22 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -151,7 +151,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"A tela está bloqueada na orientação paisagem."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"A tela está bloqueada na orientação retrato."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Iniciar o Dreams"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Modo para avião"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Carregando, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-rm/strings.xml b/packages/SystemUI/res/values-rm/strings.xml index 6dd1f961b5e8..470eb879813e 100644 --- a/packages/SystemUI/res/values-rm/strings.xml +++ b/packages/SystemUI/res/values-rm/strings.xml @@ -268,7 +268,7 @@ <skip /> <!-- no translation found for jelly_bean_dream_name (5992026543636816792) --> <skip /> - <!-- no translation found for start_dreams (870400522982252717) --> + <!-- no translation found for start_dreams (6170089063982549905) --> <skip /> <!-- no translation found for ethernet_label (7967563676324087464) --> <skip /> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index 521a143c8277..4cb1eaaeeb1f 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Ecranul este blocat în orientarea de tip peisaj."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Ecranul este blocat în orientarea de tip portret."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Porniţi Dreams"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Mod Avion"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Se încarcă, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index 8da1e80c9470..46d66d62d77c 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -151,30 +151,31 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Выбрана только альбомная ориентация экрана."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Выбрана только книжная ориентация экрана."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Включить заставку"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Режим полета"</string> - <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Идет зарядка (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> + <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Зарядка (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> <string name="quick_settings_battery_charged_label" msgid="8865413079414246081">"Заряжено"</string> <string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"Bluetooth"</string> - <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"Устройства Bluetooth (<xliff:g id="NUMBER">%d</xliff:g>)"</string> + <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"Bluetooth (<xliff:g id="NUMBER">%d</xliff:g>)"</string> <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth выкл."</string> <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Яркость"</string> <string name="quick_settings_rotation_unlocked_label" msgid="336054930362580584">"Автоповорот"</string> - <string name="quick_settings_rotation_locked_label" msgid="8058646447242565486">"Поворот экрана заблокирован"</string> + <string name="quick_settings_rotation_locked_label" msgid="8058646447242565486">"Автоповорот выкл."</string> <string name="quick_settings_ime_label" msgid="7073463064369468429">"Способ ввода"</string> - <string name="quick_settings_location_label" msgid="3292451598267467545">"Текущее местоположение"</string> - <string name="quick_settings_media_device_label" msgid="1302906836372603762">"Медиаустройство"</string> + <string name="quick_settings_location_label" msgid="3292451598267467545">"Геосервис вкл."</string> + <string name="quick_settings_media_device_label" msgid="1302906836372603762">"Режим медиа"</string> <string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string> - <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"Только экстренные вызовы"</string> + <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"Экстр. вызов"</string> <string name="quick_settings_settings_label" msgid="5326556592578065401">"Настройки"</string> <string name="quick_settings_time_label" msgid="4635969182239736408">"Время"</string> - <string name="quick_settings_user_label" msgid="5238995632130897840">"Пользователь"</string> + <string name="quick_settings_user_label" msgid="5238995632130897840">"Вы"</string> <string name="quick_settings_wifi_label" msgid="9135344704899546041">"Wi-Fi"</string> <string name="quick_settings_wifi_not_connected" msgid="7171904845345573431">"Нет соединения"</string> <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"Нет сети"</string> <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi выкл."</string> - <string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"Проектор вкл."</string> + <string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"Проектор Wi-Fi"</string> <string name="quick_settings_wifi_display_no_connection_label" msgid="7834964244709912066">"Проектор выкл."</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Яркость"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"АВТОНАСТРОЙКА"</string> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 94d222d800ae..c39cab1f5189 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -151,7 +151,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Obrazovka je uzamknutá v orientácii na šírku."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Obrazovka je uzamknutá v orientácii na výšku."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Spustiť sny"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Režim V lietadle"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Nabíjanie, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 9e2f071eda80..be6b7980676d 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Zaslon je zaklenjen v ležeči usmerjenosti."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Zaslon je zaklenjen v pokončni usmerjenosti."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Začni sanje"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Način za letalo"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Polnjenje, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index f1b5299dd28d..51d6310c82fc 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Екран је закључан у хоризонталном положају."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Екран је закључан у вертикалном положају."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Покрени Dreams"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Етернет"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Режим рада у авиону"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Пуњење, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 728d61f0f484..a46d4e89b781 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Bildskärmens riktning är nu låst i liggande format."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Bildskärmens riktning är nu låst i stående format."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Starta drömmar"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Flygplansläge"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Laddar, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 585d81395113..53c90b8074f3 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -147,7 +147,7 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Skrini imefungwa sasa katika uelekezo wa mandhari."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Skrini imefungwa katika uelekeo wa picha."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Anza ndoto"</string> + <string name="start_dreams" msgid="6170089063982549905">"Lala Sasa"</string> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Modi ya ndege"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Inachaji, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 569a16763c95..392884b98d62 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"ขณะนี้หน้าจอถูกล็อกให้วางในแนวนอน"</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"ขณะนี้หน้าจอถูกล็อกให้วางในแนวตั้ง"</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"เริ่ม Dreams"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"อีเทอร์เน็ต"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"โหมดใช้งานบนเครื่องบิน"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"กำลังชาร์จ, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 9b40c9677e89..cdcbaab70002 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Naka-lock ang screen sa pahigang oryentasyon."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Naka-lock ang screen sa patayong oryentasyon."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Simulan panaginip"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Airplane mode"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Nagcha-charge, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 56d962472f0f..34e4028a3ef8 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Ekran yatay yönde kilitlendi."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Ekran dikey yönde kilitlendi."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Rüyaları başlat"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Uçak modu"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Şarj oluyor, <xliff:g id="PERCENT">%%</xliff:g><xliff:g id="NUMBER">%d</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index 686288759c93..50fb3d0c2e76 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Екран заблоковано в альбомній орієнтації."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Екран заблоковано в книжковій орієнтації."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Увімкнути Dreams"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Режим польоту"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Заряджається, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index ff263e25329e..31a37c9c63bd 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Màn hình hiện bị khóa theo hướng ngang."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Màn hình hiện bị khóa theo hướng dọc."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Bắt đầu giấc mơ"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Chế độ trên máy bay"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Đang sạc, <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index faa7ab720af6..826e1df6cf70 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -151,7 +151,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"屏幕锁定为横向模式。"</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"屏幕锁定为纵向模式。"</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"果冻豆大乱舞"</string> - <string name="start_dreams" msgid="870400522982252717">"入梦"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"以太网"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"飞行模式"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"正在充电：<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index c71e2f6c372d..440d2f8aef7a 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -151,7 +151,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"螢幕已鎖定為橫向模式。"</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"螢幕已鎖定為垂直模式。"</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"啟動 Dream"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"乙太網路"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"飛航模式"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"充電中 (<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>)"</string> @@ -174,8 +175,8 @@ <string name="quick_settings_wifi_not_connected" msgid="7171904845345573431">"未連線"</string> <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"沒有網路"</string> <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"關閉 WiFi"</string> - <string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"WiFi 顯示器"</string> - <string name="quick_settings_wifi_display_no_connection_label" msgid="7834964244709912066">"無 WiFi 顯示器連線"</string> + <string name="quick_settings_wifi_display_label" msgid="6893592964463624333">"WiFi 顯示裝置"</string> + <string name="quick_settings_wifi_display_no_connection_label" msgid="7834964244709912066">"無 WiFi 顯示裝置連線"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"亮度"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"自動"</string> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 6dbdcc758f00..1fdee8e6204a 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -149,7 +149,8 @@ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Isikrini sikhiyelwe ngomumo we-landscape."</string> <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Isikrini sikhiyelwe ngomumo we-portrait."</string> <string name="jelly_bean_dream_name" msgid="5992026543636816792">"I-BeanFlinger"</string> - <string name="start_dreams" msgid="870400522982252717">"Qala amaphupho"</string> + <!-- no translation found for start_dreams (6170089063982549905) --> + <skip /> <string name="ethernet_label" msgid="7967563676324087464">"I-Ethernet"</string> <string name="quick_settings_airplane_mode_label" msgid="5510520633448831350">"Isimo sendiza"</string> <string name="quick_settings_battery_charging_label" msgid="490074774465309209">"Iyashaja <xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index dddef6db4e22..942e814d8342 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -66,7 +66,7 @@ <!-- Vibration duration for MultiWaveView used in SearchPanelView --> <integer translatable="false" name="config_search_panel_view_vibration_duration">20</integer> - <!-- The length of the vibration when the notificaiotn pops open. --> + <!-- The length of the vibration when the notification pops open. --> <integer name="one_finger_pop_duration_ms">10</integer> <!-- Whether we're using the tablet-optimized recents interface (we use this @@ -94,5 +94,8 @@ <!-- Timeouts for brightness dialog to disappear --> <integer name="quick_settings_brightness_dialog_short_timeout">2000</integer> <integer name="quick_settings_brightness_dialog_long_timeout">4000</integer> + + <integer name="blinds_pop_duration_ms">10</integer> + </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 5023d234d43b..4bf6c109d827 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -103,16 +103,16 @@ <!-- Initial velocity of the shade when collapsing on its own --> <dimen name="self_collapse_velocity">2000dp</dimen> <!-- Minimum final velocity of gestures interpreted as expand requests --> - <dimen name="fling_expand_min_velocity">200dp</dimen> + <dimen name="fling_expand_min_velocity">100dp</dimen> <!-- Minimum final velocity of gestures interpreted as collapse requests --> - <dimen name="fling_collapse_min_velocity">200dp</dimen> + <dimen name="fling_collapse_min_velocity">100dp</dimen> <!-- Cap on contribution of x dimension of gesture to overall velocity --> <dimen name="fling_gesture_max_x_velocity">200dp</dimen> <!-- Cap on overall resulting fling speed (s^-1) --> <dimen name="fling_gesture_max_output_velocity">3000dp</dimen> <!-- Minimum distance a fling must travel (anti-jitter) --> - <dimen name="fling_gesture_min_dist">10dp</dimen> + <dimen name="fling_gesture_min_dist">20dp</dimen> <!-- Minimum fraction of the display a gesture must travel, at any velocity, to qualify as a collapse request --> @@ -184,7 +184,7 @@ <!-- Height of the carrier/wifi name label --> <dimen name="carrier_label_height">24dp</dimen> - <!-- The distance you can pull a notificaiton before it pops open --> + <!-- The distance you can pull a notification before it pops open --> <dimen name="one_finger_pop_limit">32dp</dimen> <!-- The fixed height of each tile --> @@ -196,4 +196,9 @@ <!-- Minimum fraction of the screen that should be taken up by the notification panel. Not used at this screen size. --> <item type="dimen" name="notification_panel_min_height_frac">0%</item> + + <dimen name="blinds_pop_threshold">32dp</dimen> + + <!-- The size of the gesture span needed to activate the "pull" notification expansion --> + <dimen name="pull_span_min">25dp</dimen> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java index 674d9a3e0aac..dcfd0b346bdf 100644 --- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java @@ -50,7 +50,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { private static final long EXPAND_DURATION = 250; private static final long GLOW_DURATION = 150; - // Set to false to disable focus-based gestures (two-finger pull). + // Set to false to disable focus-based gestures (spread-finger vertical pull). private static final boolean USE_DRAG = true; // Set to false to disable scale-based gestures (both horizontal and vertical). private static final boolean USE_SPAN = true; @@ -69,8 +69,12 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { @SuppressWarnings("unused") private Context mContext; - private boolean mStretching; - private boolean mPullingWithOneFinger; + private boolean mExpanding; + private static final int NONE = 0; + private static final int BLINDS = 1<<0; + private static final int PULL = 1<<1; + private static final int STRETCH = 1<<2; + private int mExpansionStyle = NONE; private boolean mWatchingForPull; private boolean mHasPopped; private View mEventSource; @@ -86,8 +90,9 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { private int mLastMotionY; private float mPopLimit; private int mPopDuration; + private float mPullGestureMinXSpan; private Callback mCallback; - private ScaleGestureDetector mDetector; + private ScaleGestureDetector mSGD; private ViewScaler mScaler; private ObjectAnimator mScaleAnimation; private AnimatorSet mGlowAnimationSet; @@ -122,7 +127,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { if (height < 0) { height = mView.getMeasuredHeight(); } - return (float) height; + return height; } public int getNaturalHeight(int maximum) { ViewGroup.LayoutParams lp = mView.getLayoutParams(); @@ -161,8 +166,9 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { mGravity = Gravity.TOP; mScaleAnimation = ObjectAnimator.ofFloat(mScaler, "height", 0f); mScaleAnimation.setDuration(EXPAND_DURATION); - mPopLimit = mContext.getResources().getDimension(R.dimen.one_finger_pop_limit); - mPopDuration = mContext.getResources().getInteger(R.integer.one_finger_pop_duration_ms); + mPopLimit = mContext.getResources().getDimension(R.dimen.blinds_pop_threshold); + mPopDuration = mContext.getResources().getInteger(R.integer.blinds_pop_duration_ms); + mPullGestureMinXSpan = mContext.getResources().getDimension(R.dimen.pull_span_min); AnimatorListenerAdapter glowVisibilityController = new AnimatorListenerAdapter() { @Override @@ -193,41 +199,30 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { final ViewConfiguration configuration = ViewConfiguration.get(mContext); mTouchSlop = configuration.getScaledTouchSlop(); - mDetector = - new ScaleGestureDetector(context, + mSGD = new ScaleGestureDetector(context, new ScaleGestureDetector.SimpleOnScaleGestureListener() { @Override public boolean onScaleBegin(ScaleGestureDetector detector) { if (DEBUG_SCALE) Slog.v(TAG, "onscalebegin()"); - float x = detector.getFocusX(); - float y = detector.getFocusY(); + float focusX = detector.getFocusX(); + float focusY = detector.getFocusY(); // your fingers have to be somewhat close to the bounds of the view in question - mInitialTouchFocusY = detector.getFocusY(); + mInitialTouchFocusY = focusY; mInitialTouchSpan = Math.abs(detector.getCurrentSpan()); if (DEBUG_SCALE) Slog.d(TAG, "got mInitialTouchSpan: (" + mInitialTouchSpan + ")"); - mStretching = initScale(findView(x, y)); - return mStretching; + final View underFocus = findView(focusX, focusY); + if (underFocus != null) { + startExpanding(underFocus, STRETCH); + } + return mExpanding; } @Override public boolean onScale(ScaleGestureDetector detector) { if (DEBUG_SCALE) Slog.v(TAG, "onscale() on " + mCurrView); - - // are we scaling or dragging? - float span = Math.abs(detector.getCurrentSpan()) - mInitialTouchSpan; - span *= USE_SPAN ? 1f : 0f; - float drag = detector.getFocusY() - mInitialTouchFocusY; - drag *= USE_DRAG ? 1f : 0f; - drag *= mGravity == Gravity.BOTTOM ? -1f : 1f; - float pull = Math.abs(drag) + Math.abs(span) + 1f; - float hand = drag * Math.abs(drag) / pull + span * Math.abs(span) / pull; - float target = hand + mOldHeight; - float newHeight = clamp(target); - mScaler.setHeight(newHeight); - - setGlow(calculateGlow(target, newHeight)); + updateExpansion(); return true; } @@ -236,13 +231,28 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { if (DEBUG_SCALE) Slog.v(TAG, "onscaleend()"); // I guess we're alone now if (DEBUG_SCALE) Slog.d(TAG, "scale end"); - finishScale(false); + finishExpanding(false); clearView(); - mStretching = false; } }); } + private void updateExpansion() { + // are we scaling or dragging? + float span = Math.abs(mSGD.getCurrentSpan()) - mInitialTouchSpan; + span *= USE_SPAN ? 1f : 0f; + float drag = mSGD.getFocusY() - mInitialTouchFocusY; + drag *= USE_DRAG ? 1f : 0f; + drag *= mGravity == Gravity.BOTTOM ? -1f : 1f; + float pull = Math.abs(drag) + Math.abs(span) + 1f; + float hand = drag * Math.abs(drag) / pull + span * Math.abs(span) / pull; + float target = hand + mOldHeight; + float newHeight = clamp(target); + mScaler.setHeight(newHeight); + + setGlow(calculateGlow(target, newHeight)); + } + private float clamp(float target) { float out = target; out = out < mSmallSize ? mSmallSize : (out > mLargeSize ? mLargeSize : out); @@ -255,8 +265,8 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { if (mEventSource != null) { int[] location = new int[2]; mEventSource.getLocationOnScreen(location); - x += (float) location[0]; - y += (float) location[1]; + x += location[0]; + y += location[1]; v = mCallback.getChildAtRawPosition(x, y); } else { v = mCallback.getChildAtPosition(x, y); @@ -274,14 +284,14 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { if (mEventSource != null) { int[] location = new int[2]; mEventSource.getLocationOnScreen(location); - x += (float) location[0]; - y += (float) location[1]; + x += location[0]; + y += location[1]; if (DEBUG) Slog.d(TAG, " to global (" + x + ", " + y + ")"); } int[] location = new int[2]; v.getLocationOnScreen(location); - x -= (float) location[0]; - y -= (float) location[1]; + x -= location[0]; + y -= location[1]; if (DEBUG) Slog.d(TAG, " to local (" + x + ", " + y + ")"); if (DEBUG) Slog.d(TAG, " inside (" + v.getWidth() + ", " + v.getHeight() + ")"); boolean inside = (x > 0f && y > 0f && x < v.getWidth() & y < v.getHeight()); @@ -303,7 +313,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { private float calculateGlow(float target, float actual) { // glow if overscale if (DEBUG_GLOW) Slog.d(TAG, "target: " + target + " actual: " + actual); - float stretch = (float) Math.abs((target - actual) / mMaximumStretch); + float stretch = Math.abs((target - actual) / mMaximumStretch); float strength = 1f / (1f + (float) Math.pow(Math.E, -1 * ((8f * stretch) - 5f))); if (DEBUG_GLOW) Slog.d(TAG, "stretch: " + stretch + " strength: " + strength); return (GLOW_BASE + strength * (1f - GLOW_BASE)); @@ -340,32 +350,54 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { View.INVISIBLE : View.VISIBLE); } + @Override public boolean onInterceptTouchEvent(MotionEvent ev) { - if (DEBUG) Slog.d(TAG, "interceptTouch: act=" + (ev.getAction()) + - " stretching=" + mStretching + - " onefinger=" + mPullingWithOneFinger); - // check for a two-finger gesture - mDetector.onTouchEvent(ev); - if (mStretching) { + final int action = ev.getAction(); + if (DEBUG_SCALE) Slog.d(TAG, "intercept: act=" + MotionEvent.actionToString(action) + + " expanding=" + mExpanding + + (0 != (mExpansionStyle & BLINDS) ? " (blinds)" : "") + + (0 != (mExpansionStyle & PULL) ? " (pull)" : "") + + (0 != (mExpansionStyle & STRETCH) ? " (stretch)" : "")); + // check for a spread-finger vertical pull gesture + mSGD.onTouchEvent(ev); + final int x = (int) mSGD.getFocusX(); + final int y = (int) mSGD.getFocusY(); + if (mExpanding) { return true; } else { - final int action = ev.getAction(); - if ((action == MotionEvent.ACTION_MOVE) && mPullingWithOneFinger) { + if ((action == MotionEvent.ACTION_MOVE) && 0 != (mExpansionStyle & BLINDS)) { + // we've begun Venetian blinds style expansion + return true; + } + final float xspan = mSGD.getCurrentSpanX(); + if ((action == MotionEvent.ACTION_MOVE && + xspan > mPullGestureMinXSpan && + xspan > mSGD.getCurrentSpanY())) { + // detect a vertical pulling gesture with fingers somewhat separated + if (DEBUG_SCALE) Slog.v(TAG, "got pull gesture (xspan=" + xspan + "px)"); + + mInitialTouchFocusY = y; + + final View underFocus = findView(x, y); + if (underFocus != null) { + startExpanding(underFocus, PULL); + } return true; } if (mScrollView != null && mScrollView.getScrollY() > 0) { return false; } + // Now look for other gestures switch (action & MotionEvent.ACTION_MASK) { case MotionEvent.ACTION_MOVE: { if (mWatchingForPull) { - final int x = (int) ev.getX(); - final int y = (int) ev.getY(); final int yDiff = y - mLastMotionY; if (yDiff > mTouchSlop) { + if (DEBUG) Slog.v(TAG, "got venetian gesture (dy=" + yDiff + "px)"); mLastMotionY = y; - mPullingWithOneFinger = initScale(findView(x, y)); - if (mPullingWithOneFinger) { + final View underFocus = findView(x, y); + if (underFocus != null) { + startExpanding(underFocus, BLINDS); mInitialTouchY = mLastMotionY; mHasPopped = false; } @@ -375,35 +407,35 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { } case MotionEvent.ACTION_DOWN: - mWatchingForPull = isInside(mScrollView, ev.getX(), ev.getY()); - mLastMotionY = (int) ev.getY(); + mWatchingForPull = isInside(mScrollView, x, y); + mLastMotionY = y; break; case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_UP: - if (mPullingWithOneFinger) { - finishScale(false); - clearView(); - } - mPullingWithOneFinger = false; - mWatchingForPull = false; + if (DEBUG) Slog.d(TAG, "up/cancel"); + finishExpanding(false); + clearView(); break; } - return mPullingWithOneFinger; + return mExpanding; } } + @Override public boolean onTouchEvent(MotionEvent ev) { final int action = ev.getAction(); - if (DEBUG_SCALE) Slog.d(TAG, "touch: act=" + (action) + - " stretching=" + mStretching + - " onefinger=" + mPullingWithOneFinger); - if (mStretching) { - mDetector.onTouchEvent(ev); - } + if (DEBUG_SCALE) Slog.d(TAG, "touch: act=" + MotionEvent.actionToString(action) + + " expanding=" + mExpanding + + (0 != (mExpansionStyle & BLINDS) ? " (blinds)" : "") + + (0 != (mExpansionStyle & PULL) ? " (pull)" : "") + + (0 != (mExpansionStyle & STRETCH) ? " (stretch)" : "")); + + mSGD.onTouchEvent(ev); + switch (action) { case MotionEvent.ACTION_MOVE: { - if (mPullingWithOneFinger) { + if (0 != (mExpansionStyle & BLINDS)) { final float rawHeight = ev.getY() - mInitialTouchY + mOldHeight; final float newHeight = clamp(rawHeight); final boolean wasClosed = (mOldHeight == mSmallSize); @@ -430,57 +462,59 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { setGlow(calculateGlow(4f * pull, 0f)); } - final int x = (int) ev.getX(); - final int y = (int) ev.getY(); - View underPointer = findView(x, y); - if (isFinished && underPointer != null && underPointer != mCurrView) { - finishScale(false); - initScale(underPointer); - mInitialTouchY = ev.getY(); + final int x = (int) mSGD.getFocusX(); + final int y = (int) mSGD.getFocusY(); + View underFocus = findView(x, y); + if (isFinished && underFocus != null && underFocus != mCurrView) { + finishExpanding(false); // @@@ needed? + startExpanding(underFocus, BLINDS); + mInitialTouchY = y; mHasPopped = false; } return true; } + + if (mExpanding) { + updateExpansion(); + return true; + } + break; } case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: - if (DEBUG) Slog.d(TAG, "cancel"); - mStretching = false; - if (mPullingWithOneFinger) { - finishScale(false); - mPullingWithOneFinger = false; - } + if (DEBUG) Slog.d(TAG, "up/cancel"); + finishExpanding(false); clearView(); break; } return true; } - private boolean initScale(View v) { - if (v != null) { - if (DEBUG) Slog.d(TAG, "scale begins on view: " + v); - mCallback.setUserLockedChild(v, true); - setView(v); - setGlow(GLOW_BASE); - mScaler.setView(v); - mOldHeight = mScaler.getHeight(); - if (mCallback.canChildBeExpanded(v)) { - if (DEBUG) Slog.d(TAG, "working on an expandable child"); - mNaturalHeight = mScaler.getNaturalHeight(mLargeSize); - } else { - if (DEBUG) Slog.d(TAG, "working on a non-expandable child"); - mNaturalHeight = mOldHeight; - } - if (DEBUG) Slog.d(TAG, "got mOldHeight: " + mOldHeight + - " mNaturalHeight: " + mNaturalHeight); - v.getParent().requestDisallowInterceptTouchEvent(true); - return true; + + private void startExpanding(View v, int expandType) { + mExpanding = true; + mExpansionStyle = expandType; + if (DEBUG) Slog.d(TAG, "scale type " + expandType + " beginning on view: " + v); + mCallback.setUserLockedChild(v, true); + setView(v); + setGlow(GLOW_BASE); + mScaler.setView(v); + mOldHeight = mScaler.getHeight(); + if (mCallback.canChildBeExpanded(v)) { + if (DEBUG) Slog.d(TAG, "working on an expandable child"); + mNaturalHeight = mScaler.getNaturalHeight(mLargeSize); } else { - return false; + if (DEBUG) Slog.d(TAG, "working on a non-expandable child"); + mNaturalHeight = mOldHeight; } + if (DEBUG) Slog.d(TAG, "got mOldHeight: " + mOldHeight + + " mNaturalHeight: " + mNaturalHeight); + v.getParent().requestDisallowInterceptTouchEvent(true); } - private void finishScale(boolean force) { + private void finishExpanding(boolean force) { + if (!mExpanding) return; + float currentHeight = mScaler.getHeight(); float targetHeight = mSmallSize; float h = mScaler.getHeight(); @@ -501,6 +535,10 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { mScaleAnimation.start(); } mCallback.setUserLockedChild(mCurrView, false); + + mExpanding = false; + mExpansionStyle = NONE; + if (DEBUG) Slog.d(TAG, "scale was finished on view: " + mCurrView); } @@ -527,8 +565,8 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { @Override public void onClick(View v) { - initScale(v); - finishScale(true); + startExpanding(v, STRETCH); + finishExpanding(true); clearView(); } diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java index f93da08d7859..140cc8050b6e 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsActivity.java @@ -17,6 +17,7 @@ package com.android.systemui.recent; import android.app.Activity; +import android.app.ActivityManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -30,6 +31,8 @@ import com.android.systemui.R; import com.android.systemui.SystemUIApplication; import com.android.systemui.statusbar.tablet.StatusBarPanel; +import java.util.List; + public class RecentsActivity extends Activity { public static final String TOGGLE_RECENTS_INTENT = "com.android.systemui.TOGGLE_RECENTS"; public static final String CLOSE_RECENTS_INTENT = "com.android.systemui.CLOSE_RECENTS"; @@ -122,11 +125,15 @@ public class RecentsActivity extends Activity { public void dismissAndGoBack() { if (mRecentsPanel != null) { - final SystemUIApplication app = (SystemUIApplication) getApplication(); - final RecentTasksLoader recentTasksLoader = app.getRecentTasksLoader(); - TaskDescription firstTask = mRecentsPanel.getBottomTask(); - if (firstTask != null && mRecentsPanel.simulateClick(firstTask)) { - // recents panel will take care of calling show(false); + final ActivityManager am = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); + + final List<ActivityManager.RecentTaskInfo> recentTasks = + am.getRecentTasks(2, + ActivityManager.RECENT_WITH_EXCLUDED | + ActivityManager.RECENT_IGNORE_UNAVAILABLE); + if (recentTasks.size() > 1 && + mRecentsPanel.simulateClick(recentTasks.get(1).persistentId)) { + // recents panel will take care of calling show(false) through simulateClick return; } mRecentsPanel.show(false); diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java index 50b32f9c123a..6cb7decdbfd0 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsHorizontalScrollView.java @@ -76,11 +76,11 @@ public class RecentsHorizontalScrollView extends HorizontalScrollView } } - public View findViewForTask(TaskDescription task) { + public View findViewForTask(int persistentTaskId) { for (int i = 0; i < mLinearLayout.getChildCount(); i++) { View v = mLinearLayout.getChildAt(i); RecentsPanelView.ViewHolder holder = (RecentsPanelView.ViewHolder) v.getTag(); - if (holder.taskDescription == task) { + if (holder.taskDescription.persistentTaskId == persistentTaskId) { return v; } } diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java index 3a890596c534..ff519960cac8 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -95,7 +95,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener public void setAdapter(TaskDescriptionAdapter adapter); public void setCallback(RecentsCallback callback); public void setMinSwipeAlpha(float minAlpha); - public View findViewForTask(TaskDescription task); + public View findViewForTask(int persistentTaskId); } private final class OnLongClickDelegate implements View.OnLongClickListener { @@ -518,24 +518,6 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener showIfReady(); } - public TaskDescription getBottomTask() { - if (mRecentsContainer != null) { - ViewGroup container = mRecentsContainer; - if (container instanceof RecentsScrollView) { - container = (ViewGroup) container.findViewById( - R.id.recents_linear_layout); - } - if (container.getChildCount() > 0) { - View v = container.getChildAt(container.getChildCount() - 1); - if (v.getTag() instanceof ViewHolder) { - ViewHolder h = (ViewHolder)v.getTag(); - return h.taskDescription; - } - } - } - return null; - } - public void onWindowAnimationStart() { if (mItemToAnimateInWhenWindowAnimationIsFinished != null) { final int startDelay = 100; @@ -590,7 +572,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener public void onTasksLoaded(ArrayList<TaskDescription> tasks, boolean firstScreenful) { mNumItemsWaitingForThumbnailsAndIcons = firstScreenful - ? tasks.size() : mRecentTaskDescriptions == null + ? tasks.size() : mRecentTaskDescriptions == null ? 0 : mRecentTaskDescriptions.size(); if (mRecentTaskDescriptions == null) { mRecentTaskDescriptions = new ArrayList<TaskDescription>(tasks); @@ -622,11 +604,11 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener setContentDescription(recentAppsAccessibilityDescription); } - public boolean simulateClick(TaskDescription task) { + public boolean simulateClick(int persistentTaskId) { if (mRecentsContainer instanceof RecentsScrollView){ RecentsScrollView scrollView = (RecentsScrollView) mRecentsContainer; - View v = scrollView.findViewForTask(task); + View v = scrollView.findViewForTask(persistentTaskId); if (v != null) { handleOnClick(v); return true; diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java index 5e0df4937320..47b01134f10a 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsVerticalScrollView.java @@ -77,11 +77,11 @@ public class RecentsVerticalScrollView extends ScrollView } } - public View findViewForTask(TaskDescription task) { + public View findViewForTask(int persistentTaskId) { for (int i = 0; i < mLinearLayout.getChildCount(); i++) { View v = mLinearLayout.getChildAt(i); RecentsPanelView.ViewHolder holder = (RecentsPanelView.ViewHolder) v.getTag(); - if (holder.taskDescription == task) { + if (holder.taskDescription.persistentTaskId == persistentTaskId) { return v; } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index c9ec481b53ec..32b7c68466b6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -24,6 +24,7 @@ import android.util.AttributeSet; import android.view.View; import com.android.systemui.R; +import com.android.systemui.statusbar.GestureRecorder; public class NotificationPanelView extends PanelView { @@ -47,9 +48,12 @@ public class NotificationPanelView extends PanelView { @Override public void fling(float vel, boolean always) { - ((PhoneStatusBarView) mBar).mBar.getGestureRecorder().tag( - "fling " + ((vel > 0) ? "open" : "closed"), - "notifications,v=" + vel); + GestureRecorder gr = ((PhoneStatusBarView) mBar).mBar.getGestureRecorder(); + if (gr != null) { + gr.tag( + "fling " + ((vel > 0) ? "open" : "closed"), + "notifications,v=" + vel); + } super.fling(vel, always); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java index 6b9bc89ed37f..496219996b74 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java @@ -21,14 +21,16 @@ public class PanelBar extends FrameLayout { public static final int STATE_OPENING = 1; public static final int STATE_OPEN = 2; - private PanelHolder mPanelHolder; - private ArrayList<PanelView> mPanels = new ArrayList<PanelView>(); - protected PanelView mTouchingPanel; + PanelHolder mPanelHolder; + ArrayList<PanelView> mPanels = new ArrayList<PanelView>(); + PanelView mTouchingPanel; private int mState = STATE_CLOSED; private boolean mTracking; + float mPanelExpandedFractionSum; + public void go(int state) { - LOG("go state: %d -> %d", mState, state); + if (DEBUG) LOG("go state: %d -> %d", mState, state); mState = state; } @@ -84,7 +86,7 @@ public class PanelBar extends FrameLayout { if (event.getAction() == MotionEvent.ACTION_DOWN) { final PanelView panel = selectPanelForTouchX(event.getX()); boolean enabled = panel.isEnabled(); - LOG("PanelBar.onTouch: state=%d ACTION_DOWN: panel %s %s", mState, panel, + if (DEBUG) LOG("PanelBar.onTouch: state=%d ACTION_DOWN: panel %s %s", mState, panel, (enabled ? "" : " (disabled)")); if (!enabled) return false; @@ -96,15 +98,21 @@ public class PanelBar extends FrameLayout { // called from PanelView when self-expanding, too public void startOpeningPanel(PanelView panel) { - LOG("startOpeningPanel: " + panel); + if (DEBUG) LOG("startOpeningPanel: " + panel); mTouchingPanel = panel; mPanelHolder.setSelectedPanel(mTouchingPanel); + for (PanelView pv : mPanels) { + if (pv != panel) { + pv.collapse(); + } + } } public void panelExpansionChanged(PanelView panel, float frac) { boolean fullyClosed = true; PanelView fullyOpenedPanel = null; - LOG("panelExpansionChanged: start state=%d panel=%s", mState, panel.getName()); + if (DEBUG) LOG("panelExpansionChanged: start state=%d panel=%s", mState, panel.getName()); + mPanelExpandedFractionSum = 0f; for (PanelView pv : mPanels) { final boolean visible = pv.getVisibility() == View.VISIBLE; // adjust any other panels that may be partially visible @@ -115,11 +123,10 @@ public class PanelBar extends FrameLayout { } fullyClosed = false; final float thisFrac = pv.getExpandedFraction(); - LOG("panelExpansionChanged: -> %s: f=%.1f", pv.getName(), thisFrac); + mPanelExpandedFractionSum += (visible ? thisFrac : 0); + if (DEBUG) LOG("panelExpansionChanged: -> %s: f=%.1f", pv.getName(), thisFrac); if (panel == pv) { if (thisFrac == 1f) fullyOpenedPanel = panel; - } else { - pv.setExpandedFraction(1f-frac); } } if (pv.getExpandedHeight() > 0f) { @@ -128,6 +135,7 @@ public class PanelBar extends FrameLayout { if (visible) pv.setVisibility(View.GONE); } } + mPanelExpandedFractionSum /= mPanels.size(); if (fullyOpenedPanel != null && !mTracking) { go(STATE_OPEN); onPanelFullyOpened(fullyOpenedPanel); @@ -136,7 +144,7 @@ public class PanelBar extends FrameLayout { onAllPanelsCollapsed(); } - LOG("panelExpansionChanged: end state=%d [%s%s ]", mState, + if (DEBUG) LOG("panelExpansionChanged: end state=%d [%s%s ]", mState, (fullyOpenedPanel!=null)?" fullyOpened":"", fullyClosed?" fullyClosed":""); } @@ -148,9 +156,10 @@ public class PanelBar extends FrameLayout { waiting = true; } else { pv.setExpandedFraction(0); // just in case + pv.setVisibility(View.GONE); } - pv.setVisibility(View.GONE); } + if (DEBUG) LOG("collapseAllPanels: animate=%s waiting=%s", animate, waiting); if (!waiting) { // it's possible that nothing animated, so we replicate the termination // conditions of panelExpansionChanged here @@ -160,20 +169,20 @@ public class PanelBar extends FrameLayout { } public void onPanelPeeked() { - LOG("onPanelPeeked"); + if (DEBUG) LOG("onPanelPeeked"); } public void onAllPanelsCollapsed() { - LOG("onAllPanelsCollapsed"); + if (DEBUG) LOG("onAllPanelsCollapsed"); } public void onPanelFullyOpened(PanelView openPanel) { - LOG("onPanelFullyOpened"); + if (DEBUG) LOG("onPanelFullyOpened"); } public void onTrackingStarted(PanelView panel) { mTracking = true; - if (panel != mTouchingPanel) { + if (DEBUG && panel != mTouchingPanel) { LOG("shouldn't happen: onTrackingStarted(%s) != mTouchingPanel(%s)", panel, mTouchingPanel); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java index abd82bdfb43f..241ac3e0d691 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelHolder.java @@ -7,7 +7,7 @@ import android.widget.FrameLayout; public class PanelHolder extends FrameLayout { - private int mSelectedPanelIndex; + private int mSelectedPanelIndex = -1; private PanelBar mBar; public PanelHolder(Context context, AttributeSet attrs) { @@ -53,6 +53,7 @@ public class PanelHolder extends FrameLayout { public boolean onTouchEvent(MotionEvent event) { switch (event.getAction()) { case MotionEvent.ACTION_DOWN: + PanelBar.LOG("PanelHolder got touch in open air, closing panels"); mBar.collapseAllPanels(true); break; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index d94dbe44abd5..de621794a9d8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -9,14 +9,9 @@ import android.util.Slog; import android.view.MotionEvent; import android.view.VelocityTracker; import android.view.View; -import android.view.ViewGroup; import android.widget.FrameLayout; import com.android.systemui.R; -import com.android.systemui.statusbar.policy.BatteryController; -import com.android.systemui.statusbar.policy.BluetoothController; -import com.android.systemui.statusbar.policy.LocationController; -import com.android.systemui.statusbar.policy.NetworkController; public class PanelView extends FrameLayout { public static final boolean DEBUG = PanelBar.DEBUG; @@ -70,12 +65,16 @@ public class PanelView extends FrameLayout { } }; - private final Runnable mStopAnimator = new Runnable() { public void run() { - if (mTimeAnimator.isStarted()) { - mTimeAnimator.end(); - mRubberbanding = false; + private final Runnable mStopAnimator = new Runnable() { + @Override + public void run() { + if (mTimeAnimator.isStarted()) { + mTimeAnimator.end(); + mRubberbanding = false; + mClosing = false; + } } - }}; + }; private float mVel, mAccel; private int mFullHeight = 0; @@ -90,20 +89,22 @@ public class PanelView extends FrameLayout { mTimeAnimator.setTimeListener(mAnimationCallback); mTimeAnimator.start(); - - mRubberbanding = STRETCH_PAST_CONTENTS && mExpandedHeight > getFullHeight(); + + mRubberbanding = STRETCH_PAST_CONTENTS // is it enabled at all? + && mExpandedHeight > getFullHeight() // are we past the end? + && mVel >= -mFlingGestureMinDistPx; // was this not possibly a "close" gesture? if (mRubberbanding) { mClosing = true; } else if (mVel == 0) { - // if the panel is less than halfway open, close it + // if the panel is less than halfway open, close it mClosing = (mFinalTouchY / getFullHeight()) < 0.5f; } else { mClosing = mExpandedHeight > 0 && mVel < 0; } } else if (dtms > 0) { final float dt = dtms * 0.001f; // ms -> s - LOG("tick: v=%.2fpx/s dt=%.4fs", mVel, dt); - LOG("tick: before: h=%d", (int) mExpandedHeight); + if (DEBUG) LOG("tick: v=%.2fpx/s dt=%.4fs", mVel, dt); + if (DEBUG) LOG("tick: before: h=%d", (int) mExpandedHeight); final float fh = getFullHeight(); boolean braking = false; @@ -136,12 +137,12 @@ public class PanelView extends FrameLayout { } float h = mExpandedHeight + mVel * dt; - + if (mRubberbanding && h < fh) { h = fh; } - LOG("tick: new h=%d closing=%s", (int) h, mClosing?"true":"false"); + if (DEBUG) LOG("tick: new h=%d closing=%s", (int) h, mClosing?"true":"false"); setExpandedHeightInternal(h); @@ -205,14 +206,14 @@ public class PanelView extends FrameLayout { loadDimens(); mHandleView = findViewById(R.id.handle); - LOG("handle view: " + mHandleView); + if (DEBUG) LOG("handle view: " + mHandleView); if (mHandleView != null) { mHandleView.setOnTouchListener(new View.OnTouchListener() { @Override public boolean onTouch(View v, MotionEvent event) { final float y = event.getY(); final float rawY = event.getRawY(); - LOG("handle.onTouch: a=%s y=%.1f rawY=%.1f off=%.1f", + if (DEBUG) LOG("handle.onTouch: a=%s y=%.1f rawY=%.1f off=%.1f", MotionEvent.actionToString(event.getAction()), y, rawY, mTouchOffset); PanelView.this.getLocationOnScreen(mAbsPos); @@ -224,6 +225,7 @@ public class PanelView extends FrameLayout { mInitialTouchY = y; mVelocityTracker = VelocityTracker.obtain(); trackMovement(event); + mTimeAnimator.cancel(); // end any outstanding animations mBar.onTrackingStarted(PanelView.this); mTouchOffset = (rawY - mAbsPos[1]) - PanelView.this.getExpandedHeight(); break; @@ -263,9 +265,9 @@ public class PanelView extends FrameLayout { // if you've barely moved your finger, we treat the velocity as 0 // preventing spurious flings due to touch screen jitter - final float deltaY = (float)Math.abs(mFinalTouchY - mInitialTouchY); + final float deltaY = Math.abs(mFinalTouchY - mInitialTouchY); if (deltaY < mFlingGestureMinDistPx - || vel < mFlingGestureMinDistPx) { + || vel < mFlingExpandMinVelocityPx) { vel = 0; } @@ -273,7 +275,7 @@ public class PanelView extends FrameLayout { vel = -vel; } - LOG("gesture: dy=%f vraw=(%f,%f) vnorm=(%f,%f) vlinear=%f", + if (DEBUG) LOG("gesture: dy=%f vraw=(%f,%f) vnorm=(%f,%f) vlinear=%f", deltaY, mVelocityTracker.getXVelocity(), mVelocityTracker.getYVelocity(), @@ -293,6 +295,7 @@ public class PanelView extends FrameLayout { } public void fling(float vel, boolean always) { + if (DEBUG) LOG("fling: vel=%.3f, this=%s", vel, this); mVel = vel; if (always||mVel != 0) { @@ -312,7 +315,7 @@ public class PanelView extends FrameLayout { @Override protected void onViewAdded(View child) { - LOG("onViewAdded: " + child); + if (DEBUG) LOG("onViewAdded: " + child); } public View getHandle() { @@ -324,7 +327,7 @@ public class PanelView extends FrameLayout { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); - LOG("onMeasure(%d, %d) -> (%d, %d)", + if (DEBUG) LOG("onMeasure(%d, %d) -> (%d, %d)", widthMeasureSpec, heightMeasureSpec, getMeasuredWidth(), getMeasuredHeight()); // Did one of our children change size? @@ -332,7 +335,7 @@ public class PanelView extends FrameLayout { if (newHeight != mFullHeight) { mFullHeight = newHeight; // If the user isn't actively poking us, let's rubberband to the content - if (!mTracking && !mRubberbanding && !mTimeAnimator.isStarted() + if (!mTracking && !mRubberbanding && !mTimeAnimator.isStarted() && mExpandedHeight > 0 && mExpandedHeight != mFullHeight) { mExpandedHeight = mFullHeight; } @@ -351,7 +354,7 @@ public class PanelView extends FrameLayout { @Override protected void onLayout (boolean changed, int left, int top, int right, int bottom) { - LOG("onLayout: changed=%s, bottom=%d eh=%d fh=%d", changed?"T":"f", bottom, (int)mExpandedHeight, (int)mFullHeight); + if (DEBUG) LOG("onLayout: changed=%s, bottom=%d eh=%d fh=%d", changed?"T":"f", bottom, (int)mExpandedHeight, mFullHeight); super.onLayout(changed, left, top, right, bottom); } @@ -365,7 +368,7 @@ public class PanelView extends FrameLayout { if (!(STRETCH_PAST_CONTENTS && (mTracking || mRubberbanding)) && h > fh) h = fh; mExpandedHeight = h; - LOG("setExpansion: height=%.1f fh=%.1f tracking=%s rubber=%s", h, fh, mTracking?"T":"f", mRubberbanding?"T":"f"); + if (DEBUG) LOG("setExpansion: height=%.1f fh=%.1f tracking=%s rubber=%s", h, fh, mTracking?"T":"f", mRubberbanding?"T":"f"); requestLayout(); // FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) getLayoutParams(); @@ -377,9 +380,9 @@ public class PanelView extends FrameLayout { private float getFullHeight() { if (mFullHeight <= 0) { - LOG("Forcing measure() since fullHeight=" + mFullHeight); - measure(MeasureSpec.makeMeasureSpec(LayoutParams.WRAP_CONTENT, MeasureSpec.EXACTLY), - MeasureSpec.makeMeasureSpec(LayoutParams.WRAP_CONTENT, MeasureSpec.EXACTLY)); + if (DEBUG) LOG("Forcing measure() since fullHeight=" + mFullHeight); + measure(MeasureSpec.makeMeasureSpec(android.view.ViewGroup.LayoutParams.WRAP_CONTENT, MeasureSpec.EXACTLY), + MeasureSpec.makeMeasureSpec(android.view.ViewGroup.LayoutParams.WRAP_CONTENT, MeasureSpec.EXACTLY)); } return mFullHeight; } @@ -397,11 +400,15 @@ public class PanelView extends FrameLayout { } public boolean isFullyExpanded() { - return mExpandedHeight == getFullHeight(); + return mExpandedHeight >= getFullHeight(); } public boolean isFullyCollapsed() { - return mExpandedHeight == 0; + return mExpandedHeight <= 0; + } + + public boolean isCollapsing() { + return mClosing; } public void setBar(PanelBar panelBar) { @@ -410,18 +417,23 @@ public class PanelView extends FrameLayout { public void collapse() { // TODO: abort animation or ongoing touch + if (DEBUG) LOG("collapse: " + this); if (!isFullyCollapsed()) { + mTimeAnimator.cancel(); + mClosing = true; + // collapse() should never be a rubberband, even if an animation is already running + mRubberbanding = false; fling(-mSelfCollapseVelocityPx, /*always=*/ true); } } public void expand() { + if (DEBUG) LOG("expand: " + this); if (isFullyCollapsed()) { mBar.startOpeningPanel(this); - LOG("expand: calling fling(%s, true)", mSelfExpandVelocityPx); - fling (mSelfExpandVelocityPx, /*always=*/ true); + fling(mSelfExpandVelocityPx, /*always=*/ true); } else if (DEBUG) { - LOG("skipping expansion: is expanded"); + if (DEBUG) LOG("skipping expansion: is expanded"); } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 493a92a882f7..160f3b4d0a4c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -99,6 +99,7 @@ public class PhoneStatusBar extends BaseStatusBar { public static final boolean DEBUG = BaseStatusBar.DEBUG; public static final boolean SPEW = DEBUG; public static final boolean DUMPTRUCK = true; // extra dumpsys info + public static final boolean DEBUG_GESTURES = false; // additional instrumentation for testing purposes; intended to be left on during development public static final boolean CHATTY = DEBUG; @@ -247,7 +248,9 @@ public class PhoneStatusBar extends BaseStatusBar { DisplayMetrics mDisplayMetrics = new DisplayMetrics(); // XXX: gesture research - private GestureRecorder mGestureRec = new GestureRecorder("/sdcard/statusbar_gestures.dat"); + private final GestureRecorder mGestureRec = DEBUG_GESTURES + ? new GestureRecorder("/sdcard/statusbar_gestures.dat") + : null; private int mNavigationIconHints = 0; private final Animator.AnimatorListener mMakeIconsInvisible = new AnimatorListenerAdapter() { @@ -336,7 +339,9 @@ public class PhoneStatusBar extends BaseStatusBar { mNotificationPanelIsFullScreenWidth = (mNotificationPanel.getLayoutParams().width == ViewGroup.LayoutParams.MATCH_PARENT); mNotificationPanel.setSystemUiVisibility( - View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER | View.STATUS_BAR_DISABLE_NOTIFICATION_ICONS); + View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER | + View.STATUS_BAR_DISABLE_NOTIFICATION_ICONS | + View.STATUS_BAR_DISABLE_CLOCK); if (!ActivityManager.isHighEndGfx()) { mStatusBarWindow.setBackground(null); @@ -1350,7 +1355,9 @@ public class PhoneStatusBar extends BaseStatusBar { } } - mGestureRec.add(event); + if (DEBUG_GESTURES) { + mGestureRec.add(event); + } return false; } @@ -1630,8 +1637,10 @@ public class PhoneStatusBar extends BaseStatusBar { } } - pw.print(" status bar gestures: "); - mGestureRec.dump(fd, pw, args); + if (DEBUG_GESTURES) { + pw.print(" status bar gestures: "); + mGestureRec.dump(fd, pw, args); + } mNetworkController.dump(fd, pw, args); } @@ -1713,8 +1722,10 @@ public class PhoneStatusBar extends BaseStatusBar { // called by makeStatusbar and also by PhoneStatusBarView void updateDisplaySize() { mDisplay.getMetrics(mDisplayMetrics); - mGestureRec.tag("display", - String.format("%dx%d", mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels)); + if (DEBUG_GESTURES) { + mGestureRec.tag("display", + String.format("%dx%d", mDisplayMetrics.widthPixels, mDisplayMetrics.heightPixels)); + } } private View.OnClickListener mClearButtonListener = new View.OnClickListener() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java index 6517e7cfa634..516b1abb3f58 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java @@ -19,27 +19,14 @@ package com.android.systemui.statusbar.phone; import android.app.ActivityManager; import android.app.StatusBarManager; import android.content.Context; -import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.Resources.NotFoundException; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Rect; -import android.os.SystemClock; import android.util.AttributeSet; -import android.util.Log; import android.util.Slog; -import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; -import android.view.ViewGroup; -import android.view.ViewParent; import android.view.accessibility.AccessibilityEvent; -import android.widget.FrameLayout; - import com.android.systemui.R; -import com.android.systemui.statusbar.BaseStatusBar; -import com.android.systemui.statusbar.policy.FixedSizeDrawable; public class PhoneStatusBarView extends PanelBar { private static final String TAG = "PhoneStatusBarView"; @@ -53,6 +40,7 @@ public class PhoneStatusBarView extends PanelBar { boolean mFullWidthNotifications; PanelView mFadingPanel = null; PanelView mNotificationPanel, mSettingsPanel; + private boolean mShouldFade; public PhoneStatusBarView(Context context, AttributeSet attrs) { super(context, attrs); @@ -112,7 +100,7 @@ public class PhoneStatusBarView extends PanelBar { if (DEBUG) { Slog.v(TAG, "notif frac=" + mNotificationPanel.getExpandedFraction()); } - return (mNotificationPanel.getExpandedFraction() == 1.0f) + return (mNotificationPanel.getExpandedFraction() > 0f) ? mSettingsPanel : mNotificationPanel; } @@ -120,7 +108,7 @@ public class PhoneStatusBarView extends PanelBar { // right 1/3 for quick settings. If you pull the status bar down a second time you'll // toggle panels no matter where you pull it down. - final float w = (float) getMeasuredWidth(); + final float w = getMeasuredWidth(); float region = (w * mSettingsPanelDragzoneFrac); if (DEBUG) { @@ -138,9 +126,18 @@ public class PhoneStatusBarView extends PanelBar { public void onPanelPeeked() { super.onPanelPeeked(); mBar.makeExpandedVisible(true); - if (mFadingPanel == null) { - mFadingPanel = mTouchingPanel; + } + + @Override + public void startOpeningPanel(PanelView panel) { + super.startOpeningPanel(panel); + // we only want to start fading if this is the "first" or "last" panel, + // which is kind of tricky to determine + mShouldFade = (mFadingPanel == null || mFadingPanel.isFullyExpanded()); + if (DEBUG) { + Slog.v(TAG, "start opening: " + panel + " shouldfade=" + mShouldFade); } + mFadingPanel = panel; } @Override @@ -152,7 +149,9 @@ public class PhoneStatusBarView extends PanelBar { @Override public void onPanelFullyOpened(PanelView openPanel) { + super.onPanelFullyOpened(openPanel); mFadingPanel = openPanel; + mShouldFade = true; // now you own the fade, mister } @Override @@ -166,24 +165,24 @@ public class PhoneStatusBarView extends PanelBar { } @Override - public void panelExpansionChanged(PanelView pv, float frac) { - super.panelExpansionChanged(pv, frac); + public void panelExpansionChanged(PanelView panel, float frac) { + super.panelExpansionChanged(panel, frac); if (DEBUG) { Slog.v(TAG, "panelExpansionChanged: f=" + frac); } - if (mFadingPanel == pv - && mScrimColor != 0 && ActivityManager.isHighEndGfx()) { - // woo, special effects - final float k = (float)(1f-0.5f*(1f-Math.cos(3.14159f * Math.pow(1f-frac, 2.2f)))); - // attenuate background color alpha by k - final int color = (int) ((float)(mScrimColor >>> 24) * k) << 24 | (mScrimColor & 0xFFFFFF); - mBar.mStatusBarWindow.setBackgroundColor(color); + if (panel == mFadingPanel && mScrimColor != 0 && ActivityManager.isHighEndGfx()) { + if (mShouldFade) { + frac = mPanelExpandedFractionSum; // don't judge me + // woo, special effects + final float k = (float)(1f-0.5f*(1f-Math.cos(3.14159f * Math.pow(1f-frac, 2.2f)))); + // attenuate background color alpha by k + final int color = (int) ((mScrimColor >>> 24) * k) << 24 | (mScrimColor & 0xFFFFFF); + mBar.mStatusBarWindow.setBackgroundColor(color); + } } mBar.updateCarrierLabelVisibility(false); } - - } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java index c31e138a621f..4ef35aace041 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -20,6 +20,7 @@ import android.app.ActivityManagerNative; import android.app.AlertDialog; import android.app.Dialog; import android.app.PendingIntent; +import android.bluetooth.BluetoothAdapter; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -81,6 +82,7 @@ class QuickSettings { private DisplayManager mDisplayManager; private WifiDisplayStatus mWifiDisplayStatus; private PhoneStatusBar mStatusBarService; + private QuickSettingsModel.BluetoothState mBluetoothState; private BrightnessController mBrightnessController; private BluetoothController mBluetoothController; @@ -115,6 +117,7 @@ class QuickSettings { mContainerView = container; mModel = new QuickSettingsModel(context); mWifiDisplayStatus = new WifiDisplayStatus(); + mBluetoothState = new QuickSettingsModel.BluetoothState(); mHandler = new Handler(); Resources r = mContext.getResources(); @@ -128,6 +131,7 @@ class QuickSettings { IntentFilter filter = new IntentFilter(); filter.addAction(DisplayManager.ACTION_WIFI_DISPLAY_STATUS_CHANGED); + filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED); mContext.registerReceiver(mReceiver, filter); } @@ -739,6 +743,10 @@ class QuickSettings { mModel.onWifiDisplayStateChanged(mWifiDisplayStatus); } + private void applyBluetoothStatus() { + mModel.onBluetoothStateChange(mBluetoothState); + } + private final BroadcastReceiver mReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -748,6 +756,12 @@ class QuickSettings { mWifiDisplayStatus = status; applyWifiDisplayStatus(); } + if (intent.getAction().equals(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED)) { + int status = intent.getIntExtra(BluetoothAdapter.EXTRA_CONNECTION_STATE, + BluetoothAdapter.STATE_DISCONNECTED); + mBluetoothState.connected = (status == BluetoothAdapter.STATE_CONNECTED); + applyBluetoothStatus(); + } } }; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java index 6b9a32108186..0e5361735b37 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java @@ -77,6 +77,9 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, static class BrightnessState extends State { boolean autoBrightness; } + public static class BluetoothState extends State { + boolean connected = false; + } /** The callback to update a given tile. */ interface RefreshCallback { @@ -173,7 +176,7 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, private QuickSettingsTileView mBluetoothTile; private RefreshCallback mBluetoothCallback; - private State mBluetoothState = new State(); + private BluetoothState mBluetoothState = new BluetoothState(); private QuickSettingsTileView mBatteryTile; private RefreshCallback mBatteryCallback; @@ -354,7 +357,7 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, mWifiState.label = removeDoubleQuotes(enabledDesc); } else if (wifiNotConnected) { mWifiState.iconId = R.drawable.ic_qs_wifi_0; - mWifiState.label = r.getString(R.string.quick_settings_wifi_not_connected); + mWifiState.label = r.getString(R.string.quick_settings_wifi_label); } else { mWifiState.iconId = R.drawable.ic_qs_wifi_no_network; mWifiState.label = r.getString(R.string.quick_settings_wifi_off_label); @@ -398,7 +401,10 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, mBluetoothCallback = cb; final BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); - onBluetoothStateChange(adapter.isEnabled()); + mBluetoothState.enabled = adapter.isEnabled(); + mBluetoothState.connected = + (adapter.getConnectionState() == BluetoothAdapter.STATE_CONNECTED); + onBluetoothStateChange(mBluetoothState); } boolean deviceSupportsBluetooth() { return (BluetoothAdapter.getDefaultAdapter() != null); @@ -406,11 +412,20 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, // BluetoothController callback @Override public void onBluetoothStateChange(boolean on) { + mBluetoothState.enabled = on; + onBluetoothStateChange(mBluetoothState); + } + public void onBluetoothStateChange(BluetoothState bluetoothStateIn) { // TODO: If view is in awaiting state, disable Resources r = mContext.getResources(); - mBluetoothState.enabled = on; - if (on) { - mBluetoothState.iconId = R.drawable.ic_qs_bluetooth_on; + mBluetoothState.enabled = bluetoothStateIn.enabled; + mBluetoothState.connected = bluetoothStateIn.connected; + if (mBluetoothState.enabled) { + if (mBluetoothState.connected) { + mBluetoothState.iconId = R.drawable.ic_qs_bluetooth_on; + } else { + mBluetoothState.iconId = R.drawable.ic_qs_bluetooth_not_connected; + } mBluetoothState.label = r.getString(R.string.quick_settings_bluetooth_label); } else { mBluetoothState.iconId = R.drawable.ic_qs_bluetooth_off; @@ -632,5 +647,4 @@ class QuickSettingsModel implements BluetoothStateChangeCallback, onNextAlarmChanged(); onBugreportChanged(); } - } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsScrollView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsScrollView.java new file mode 100644 index 000000000000..8a2f8d684769 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsScrollView.java @@ -0,0 +1,59 @@ +/* + * 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.systemui.statusbar.phone; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.view.View; +import android.widget.ScrollView; + +public class QuickSettingsScrollView extends ScrollView { + + public QuickSettingsScrollView(Context context) { + super(context); + } + + public QuickSettingsScrollView(Context context, AttributeSet attrs) { + super(context, attrs); + } + + public QuickSettingsScrollView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + } + + // Y U NO PROTECTED + private int getScrollRange() { + int scrollRange = 0; + if (getChildCount() > 0) { + View child = getChildAt(0); + scrollRange = Math.max(0, + child.getHeight() - (getHeight() - mPaddingBottom - mPaddingTop)); + } + return scrollRange; + } + + @Override + public boolean onTouchEvent(MotionEvent ev) { + final int range = getScrollRange(); + if (range == 0) { + return false; + } + + return super.onTouchEvent(ev); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java index f9d9dac01047..e555277cc1ee 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SettingsPanelView.java @@ -29,6 +29,7 @@ import android.view.ViewGroup; import com.android.systemui.R; import com.android.systemui.statusbar.BaseStatusBar; +import com.android.systemui.statusbar.GestureRecorder; import com.android.systemui.statusbar.policy.BatteryController; import com.android.systemui.statusbar.policy.BluetoothController; import com.android.systemui.statusbar.policy.LocationController; @@ -95,9 +96,12 @@ public class SettingsPanelView extends PanelView { @Override public void fling(float vel, boolean always) { - ((PhoneStatusBarView) mBar).mBar.getGestureRecorder().tag( - "fling " + ((vel > 0) ? "open" : "closed"), - "settings,v=" + vel); + GestureRecorder gr = ((PhoneStatusBarView) mBar).mBar.getGestureRecorder(); + if (gr != null) { + gr.tag( + "fling " + ((vel > 0) ? "open" : "closed"), + "settings,v=" + vel); + } super.fling(vel, always); } diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java index 5007cf4a3033..ff0663074ee3 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbAccessoryUriActivity.java @@ -26,6 +26,7 @@ import android.net.Uri; import android.hardware.usb.UsbAccessory; import android.hardware.usb.UsbManager; import android.os.Bundle; +import android.os.UserHandle; import android.util.Log; import com.android.internal.app.AlertActivity; @@ -90,7 +91,7 @@ public class UsbAccessoryUriActivity extends AlertActivity intent.addCategory(Intent.CATEGORY_BROWSABLE); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); try { - startActivity(intent); + startActivityAsUser(intent, UserHandle.CURRENT); } catch (ActivityNotFoundException e) { Log.e(TAG, "startActivity failed for " + mUri); } diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java index 030a2615b7d0..3eccccdd75bf 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java @@ -16,23 +16,21 @@ package com.android.systemui.usb; -import android.app.Activity; import android.app.AlertDialog; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.hardware.usb.IUsbManager; -import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbAccessory; +import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbManager; import android.os.Bundle; import android.os.IBinder; -import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -42,7 +40,6 @@ import android.widget.TextView; import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; - import com.android.systemui.R; public class UsbConfirmActivity extends AlertActivity @@ -62,10 +59,10 @@ public class UsbConfirmActivity extends AlertActivity public void onCreate(Bundle icicle) { super.onCreate(icicle); - Intent intent = getIntent(); - mDevice = (UsbDevice)intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); + Intent intent = getIntent(); + mDevice = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); mAccessory = (UsbAccessory)intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY); - mResolveInfo = (ResolveInfo)intent.getParcelableExtra("rinfo"); + mResolveInfo = (ResolveInfo) intent.getParcelableExtra("rinfo"); PackageManager packageManager = getPackageManager(); String appName = mResolveInfo.loadLabel(packageManager).toString(); @@ -117,7 +114,8 @@ public class UsbConfirmActivity extends AlertActivity try { IBinder b = ServiceManager.getService(USB_SERVICE); IUsbManager service = IUsbManager.Stub.asInterface(b); - int uid = mResolveInfo.activityInfo.applicationInfo.uid; + final int uid = mResolveInfo.activityInfo.applicationInfo.uid; + final int userId = UserHandle.myUserId(); boolean alwaysUse = mAlwaysUse.isChecked(); Intent intent = null; @@ -129,9 +127,10 @@ public class UsbConfirmActivity extends AlertActivity service.grantDevicePermission(mDevice, uid); // set or clear default setting if (alwaysUse) { - service.setDevicePackage(mDevice, mResolveInfo.activityInfo.packageName); + service.setDevicePackage( + mDevice, mResolveInfo.activityInfo.packageName, userId); } else { - service.setDevicePackage(mDevice, null); + service.setDevicePackage(mDevice, null, userId); } } else if (mAccessory != null) { intent = new Intent(UsbManager.ACTION_USB_ACCESSORY_ATTACHED); @@ -141,10 +140,10 @@ public class UsbConfirmActivity extends AlertActivity service.grantAccessoryPermission(mAccessory, uid); // set or clear default setting if (alwaysUse) { - service.setAccessoryPackage(mAccessory, - mResolveInfo.activityInfo.packageName); + service.setAccessoryPackage( + mAccessory, mResolveInfo.activityInfo.packageName, userId); } else { - service.setAccessoryPackage(mAccessory, null); + service.setAccessoryPackage(mAccessory, null, userId); } } @@ -152,7 +151,7 @@ public class UsbConfirmActivity extends AlertActivity intent.setComponent( new ComponentName(mResolveInfo.activityInfo.packageName, mResolveInfo.activityInfo.name)); - startActivity(intent); + startActivityAsUser(intent, new UserHandle(userId)); } catch (Exception e) { Log.e(TAG, "Unable to start activity", e); } diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java index c384f5023ce3..6e88d0d91c7f 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbPermissionActivity.java @@ -32,6 +32,7 @@ import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -67,7 +68,7 @@ public class UsbPermissionActivity extends AlertActivity mDevice = (UsbDevice)intent.getParcelableExtra(UsbManager.EXTRA_DEVICE); mAccessory = (UsbAccessory)intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY); mPendingIntent = (PendingIntent)intent.getParcelableExtra(Intent.EXTRA_INTENT); - mUid = intent.getIntExtra("uid", 0); + mUid = intent.getIntExtra(Intent.EXTRA_UID, -1); mPackageName = intent.getStringExtra("package"); PackageManager packageManager = getPackageManager(); @@ -128,7 +129,8 @@ public class UsbPermissionActivity extends AlertActivity if (mPermissionGranted) { service.grantDevicePermission(mDevice, mUid); if (mAlwaysUse.isChecked()) { - service.setDevicePackage(mDevice, mPackageName); + final int userId = UserHandle.getUserId(mUid); + service.setDevicePackage(mDevice, mPackageName, userId); } } } @@ -137,7 +139,8 @@ public class UsbPermissionActivity extends AlertActivity if (mPermissionGranted) { service.grantAccessoryPermission(mAccessory, mUid); if (mAlwaysUse.isChecked()) { - service.setAccessoryPackage(mAccessory, mPackageName); + final int userId = UserHandle.getUserId(mUid); + service.setAccessoryPackage(mAccessory, mPackageName, userId); } } } diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java index f61ecb10318c..9928f7f60306 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java +++ b/packages/SystemUI/src/com/android/systemui/usb/UsbResolverActivity.java @@ -16,8 +16,6 @@ package com.android.systemui.usb; -import com.android.internal.app.ResolverActivity; - import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.pm.ResolveInfo; @@ -30,9 +28,11 @@ import android.os.IBinder; import android.os.Parcelable; import android.os.RemoteException; import android.os.ServiceManager; +import android.os.UserHandle; import android.util.Log; import android.widget.CheckBox; +import com.android.internal.app.ResolverActivity; import com.android.systemui.R; import java.util.ArrayList; @@ -92,34 +92,36 @@ public class UsbResolverActivity extends ResolverActivity { super.onDestroy(); } + @Override protected void onIntentSelected(ResolveInfo ri, Intent intent, boolean alwaysCheck) { try { IBinder b = ServiceManager.getService(USB_SERVICE); IUsbManager service = IUsbManager.Stub.asInterface(b); - int uid = ri.activityInfo.applicationInfo.uid; + final int uid = ri.activityInfo.applicationInfo.uid; + final int userId = UserHandle.myUserId(); if (mDevice != null) { // grant permission for the device service.grantDevicePermission(mDevice, uid); // set or clear default setting if (alwaysCheck) { - service.setDevicePackage(mDevice, ri.activityInfo.packageName); + service.setDevicePackage(mDevice, ri.activityInfo.packageName, userId); } else { - service.setDevicePackage(mDevice, null); + service.setDevicePackage(mDevice, null, userId); } } else if (mAccessory != null) { // grant permission for the accessory service.grantAccessoryPermission(mAccessory, uid); // set or clear default setting if (alwaysCheck) { - service.setAccessoryPackage(mAccessory, ri.activityInfo.packageName); + service.setAccessoryPackage(mAccessory, ri.activityInfo.packageName, userId); } else { - service.setAccessoryPackage(mAccessory, null); + service.setAccessoryPackage(mAccessory, null, userId); } } try { - startActivity(intent); + startActivityAsUser(intent, new UserHandle(userId)); } catch (ActivityNotFoundException e) { Log.e(TAG, "startActivity failed", e); } diff --git a/policy/src/com/android/internal/policy/impl/EnableAccessibilityController.java b/policy/src/com/android/internal/policy/impl/EnableAccessibilityController.java index 889463b7eec0..71b0d53572d2 100644 --- a/policy/src/com/android/internal/policy/impl/EnableAccessibilityController.java +++ b/policy/src/com/android/internal/policy/impl/EnableAccessibilityController.java @@ -40,6 +40,7 @@ import android.view.accessibility.IAccessibilityManager; import com.android.internal.R; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -131,8 +132,9 @@ public class EnableAccessibilityController { private static List<AccessibilityServiceInfo> getInstalledSpeakingAccessibilityServices( Context context) { - List<AccessibilityServiceInfo> services = AccessibilityManager.getInstance( - context).getInstalledAccessibilityServiceList(); + List<AccessibilityServiceInfo> services = new ArrayList<AccessibilityServiceInfo>(); + services.addAll(AccessibilityManager.getInstance(context) + .getInstalledAccessibilityServiceList()); Iterator<AccessibilityServiceInfo> iterator = services.iterator(); while (iterator.hasNext()) { AccessibilityServiceInfo service = iterator.next(); diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java index e1c7e32bd1f9..19ed45e0aaf5 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -39,12 +39,15 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.os.RemoteException; +import android.os.ServiceManager; import android.os.SystemClock; import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.os.Vibrator; import android.provider.Settings; +import android.service.dreams.DreamService; +import android.service.dreams.IDreamManager; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.TelephonyManager; @@ -83,6 +86,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac private final Context mContext; private final WindowManagerFuncs mWindowManagerFuncs; private final AudioManager mAudioManager; + private final IDreamManager mDreamManager; private ArrayList<Action> mItems; private GlobalActionsDialog mDialog; @@ -106,6 +110,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac mContext = context; mWindowManagerFuncs = windowManagerFuncs; mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); + mDreamManager = IDreamManager.Stub.asInterface( + ServiceManager.getService(DreamService.DREAM_SERVICE)); // receive broadcasts IntentFilter filter = new IntentFilter(); @@ -145,7 +151,20 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac } } + private void awakenIfNecessary() { + if (mDreamManager != null) { + try { + if (mDreamManager.isDreaming()) { + mDreamManager.awaken(); + } + } catch (RemoteException e) { + // we tried + } + } + } + private void handleShow() { + awakenIfNecessary(); mDialog = createDialog(); prepareDialog(); diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 93f2aa55a481..ba76bcd79731 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2573,11 +2573,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { final boolean hasNavBar = (isDefaultDisplay && mHasNavigationBar && mNavigationBar != null && mNavigationBar.isVisibleLw()); + final int adjust = sim & SOFT_INPUT_MASK_ADJUST; + if (!isDefaultDisplay) { if (attached != null) { // If this window is attached to another, our display // frame is the same as the one we are attached to. - setAttachedWindowFrames(win, fl, sim, attached, true, pf, df, cf, vf); + setAttachedWindowFrames(win, fl, adjust, attached, true, pf, df, cf, vf); } else { // Give the window full screen. pf.left = df.left = cf.left = mUnrestrictedScreenLeft; @@ -2596,8 +2598,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { attrs.gravity = Gravity.BOTTOM; mDockLayer = win.getSurfaceLayer(); } else { - final int adjust = sim & SOFT_INPUT_MASK_ADJUST; - if ((fl & (FLAG_LAYOUT_IN_SCREEN | FLAG_FULLSCREEN | FLAG_LAYOUT_INSET_DECOR)) == (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR) && (sysUiFl & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) { @@ -2611,7 +2611,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (attached != null) { // If this window is attached to another, our display // frame is the same as the one we are attached to. - setAttachedWindowFrames(win, fl, sim, attached, true, pf, df, cf, vf); + setAttachedWindowFrames(win, fl, adjust, attached, true, pf, df, cf, vf); } else { if (attrs.type == TYPE_STATUS_BAR_PANEL || attrs.type == TYPE_STATUS_BAR_SUB_PANEL) { @@ -2826,7 +2826,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { // Dock windows carve out the bottom of the screen, so normal windows // can't appear underneath them. - if (attrs.type == TYPE_INPUT_METHOD && !win.getGivenInsetsPendingLw()) { + if (attrs.type == TYPE_INPUT_METHOD && win.isVisibleOrBehindKeyguardLw() + && !win.getGivenInsetsPendingLw()) { setLastInputMethodWindowLw(null, null); offsetInputMethodWindowLw(win); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java index a7fc1a165490..f0dfba11765c 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java @@ -67,6 +67,8 @@ public class KeyguardHostView extends KeyguardViewBase { private AppWidgetHost mAppWidgetHost; private KeyguardWidgetPager mAppWidgetContainer; private ViewFlipper mSecurityViewContainer; + private KeyguardSelectorView mKeyguardSelectorView; + private KeyguardTransportControlView mTransportControl; private boolean mEnableMenuKey; private boolean mIsVerifyUnlockOnly; private boolean mEnableFallback; // TODO: This should get the value from KeyguardPatternView @@ -80,7 +82,6 @@ public class KeyguardHostView extends KeyguardViewBase { private KeyguardSecurityModel mSecurityModel; private Rect mTempRect = new Rect(); - private KeyguardTransportControlView mTransportControl; /*package*/ interface TransportCallback { void hide(); @@ -90,6 +91,7 @@ public class KeyguardHostView extends KeyguardViewBase { /*package*/ interface UserSwitcherCallback { void hideSecurityView(int duration); void showSecurityView(); + void showUnlockHint(); } public KeyguardHostView(Context context) { @@ -144,46 +146,9 @@ public class KeyguardHostView extends KeyguardViewBase { KeyguardWidgetRegion kgwr = (KeyguardWidgetRegion) findViewById(R.id.kg_widget_region); kgwr.setVisibility(VISIBLE); mSecurityViewContainer = (ViewFlipper) findViewById(R.id.view_flipper); + mKeyguardSelectorView = (KeyguardSelectorView) findViewById(R.id.keyguard_selector_view); - // This code manages showing/hiding the transport control. We keep it around and only - // add it to the hierarchy if it needs to be present. - mTransportControl = - (KeyguardTransportControlView) findViewById(R.id.keyguard_transport_control); - if (mTransportControl != null) { - mTransportControl.setKeyguardCallback(new TransportCallback() { - boolean mSticky = false; - @Override - public void hide() { - int page = getWidgetPosition(R.id.keyguard_transport_control); - if (page != -1 && !mSticky) { - if (page == mAppWidgetContainer.getCurrentPage()) { - // Switch back to clock view if music was showing. - mAppWidgetContainer - .setCurrentPage(getWidgetPosition(R.id.keyguard_status_view)); - } - mAppWidgetContainer.removeView(mTransportControl); - // XXX keep view attached to hierarchy so we still get show/hide events - // from AudioManager - KeyguardHostView.this.addView(mTransportControl); - mTransportControl.setVisibility(View.GONE); - showAppropriateWidgetPage(); - } - } - - @Override - public void show() { - if (getWidgetPosition(R.id.keyguard_transport_control) == -1) { - KeyguardHostView.this.removeView(mTransportControl); - mAppWidgetContainer.addView(mTransportControl, - getWidgetPosition(R.id.keyguard_status_view) + 1); - mTransportControl.setVisibility(View.VISIBLE); - // Once shown, leave it showing - mSticky = true; - showAppropriateWidgetPage(); - } - } - }); - } + addDefaultWidgets(); updateSecurityViews(); setSystemUiVisibility(getSystemUiVisibility() | View.STATUS_BAR_DISABLE_BACK); } @@ -411,6 +376,18 @@ public class KeyguardHostView extends KeyguardViewBase { showSecurityScreen(mSecurityModel.getBackupFor(currentMode)); } + public boolean showNextSecurityScreenIfPresent() { + SecurityMode securityMode = mSecurityModel.getSecurityMode(); + // Allow an alternate, such as biometric unlock + securityMode = mSecurityModel.getAlternateFor(securityMode); + if (SecurityMode.None == securityMode) { + return false; + } else { + showSecurityScreen(securityMode); // switch to the alternate security view + return true; + } + } + private void showNextSecurityScreenOrFinish(boolean authenticated) { boolean finish = false; if (SecurityMode.None == mCurrentSecuritySelection) { @@ -702,6 +679,52 @@ public class KeyguardHostView extends KeyguardViewBase { } } + private void addDefaultWidgets() { + LayoutInflater inflater = LayoutInflater.from(mContext); + inflater.inflate(R.layout.keyguard_status_view, mAppWidgetContainer, true); + inflater.inflate(R.layout.keyguard_transport_control_view, mAppWidgetContainer, true); + + mTransportControl = + (KeyguardTransportControlView) findViewById(R.id.keyguard_transport_control); + + + // This code manages showing/hiding the transport control. We keep it around and only + // add it to the hierarchy if it needs to be present. + if (mTransportControl != null) { + mTransportControl.setKeyguardCallback(new TransportCallback() { + boolean mSticky = false; + @Override + public void hide() { + int page = getWidgetPosition(R.id.keyguard_transport_control); + if (page != -1 && !mSticky) { + if (page == mAppWidgetContainer.getCurrentPage()) { + // Switch back to clock view if music was showing. + mAppWidgetContainer + .setCurrentPage(getWidgetPosition(R.id.keyguard_status_view)); + } + mAppWidgetContainer.removeView(mTransportControl); + // XXX keep view attached to hierarchy so we still get show/hide events + // from AudioManager + KeyguardHostView.this.addView(mTransportControl); + mTransportControl.setVisibility(View.GONE); + } + } + + @Override + public void show() { + if (getWidgetPosition(R.id.keyguard_transport_control) == -1) { + KeyguardHostView.this.removeView(mTransportControl); + mAppWidgetContainer.addView(mTransportControl, + getWidgetPosition(R.id.keyguard_status_view) + 1); + mTransportControl.setVisibility(View.VISIBLE); + // Once shown, leave it showing + mSticky = true; + } + } + }); + } + } + private void maybePopulateWidgets() { DevicePolicyManager dpm = (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE); @@ -716,6 +739,7 @@ public class KeyguardHostView extends KeyguardViewBase { inflateAndAddUserSelectorWidgetIfNecessary(); // Add status widget + View statusView = null; int statusWidgetId = mLockPatternUtils.getStatusWidget(); if (statusWidgetId != -1) { addWidget(statusWidgetId); @@ -729,6 +753,16 @@ public class KeyguardHostView extends KeyguardViewBase { mAppWidgetContainer.removeView(newStatusWidget); newStatusWidget.setId(R.id.keyguard_status_view); mAppWidgetContainer.addView(newStatusWidget, oldStatusWidgetPosition); + statusView = newStatusWidget; + } else { + statusView = findViewById(R.id.keyguard_status_view); + } + + // Disable all user interaction on status view. This is done to prevent falsing in the + // pocket from triggering useractivity and prevents 3rd party replacement widgets + // from responding to user interaction while in this position. + if (statusView instanceof KeyguardWidgetFrame) { + ((KeyguardWidgetFrame) statusView).setDisableUserInteraction(true); } // Add user-selected widget @@ -775,6 +809,12 @@ public class KeyguardHostView extends KeyguardViewBase { public void showSecurityView() { mSecurityViewContainer.setAlpha(1.0f); } + + @Override + public void showUnlockHint() { + mKeyguardSelectorView.ping(); + } + }; multiUser.setCallback(callback); } @@ -812,4 +852,8 @@ public class KeyguardHostView extends KeyguardViewBase { } } + public void goToUserSwitcher() { + mAppWidgetContainer.setCurrentPage(getWidgetPosition(R.id.keyguard_multi_user_selector)); + } + } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java index 8c1dfe19977b..7266883f8148 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserAvatar.java @@ -22,11 +22,11 @@ import android.animation.ValueAnimator; import android.animation.ValueAnimator.AnimatorUpdateListener; import android.content.Context; import android.content.pm.UserInfo; +import android.content.res.Resources; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.LayoutInflater; -import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; @@ -38,9 +38,13 @@ class KeyguardMultiUserAvatar extends FrameLayout { private ImageView mUserImage; private TextView mUserName; private UserInfo mUserInfo; - private static final int INACTIVE_COLOR = 85; - private static final int INACTIVE_ALPHA = 195; - private static final float ACTIVE_SCALE = 1.1f; + private static final float ACTIVE_ALPHA = 1.0f; + private static final float INACTIVE_ALPHA = 0.5f; + private static final float ACTIVE_SCALE = 1.2f; + private static final float ACTIVE_TEXT_BACGROUND_ALPHA = 0.5f; + private static final float INACTIVE_TEXT_BACGROUND_ALPHA = 0f; + private static int mActiveTextColor; + private static int mInactiveTextColor; private boolean mActive; private boolean mInit = true; private KeyguardMultiUserSelectorView mUserSelector; @@ -53,31 +57,32 @@ class KeyguardMultiUserAvatar extends FrameLayout { KeyguardMultiUserAvatar icon = (KeyguardMultiUserAvatar) LayoutInflater.from(context).inflate(resId, userSelector, false); - icon.setup(info, userSelector); + icon.init(info, userSelector); return icon; } public KeyguardMultiUserAvatar(Context context) { - super(context, null, 0); + this(context, null, 0); } public KeyguardMultiUserAvatar(Context context, AttributeSet attrs) { - super(context, attrs, 0); + this(context, attrs, 0); } public KeyguardMultiUserAvatar(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); + + Resources res = mContext.getResources(); + mActiveTextColor = res.getColor(R.color.kg_multi_user_text_active); + mInactiveTextColor = res.getColor(R.color.kg_multi_user_text_inactive); } - public void setup(UserInfo user, KeyguardMultiUserSelectorView userSelector) { + public void init(UserInfo user, KeyguardMultiUserSelectorView userSelector) { mUserInfo = user; mUserSelector = userSelector; - init(); - } - private void init() { mUserImage = (ImageView) findViewById(R.id.keyguard_user_avatar); - mUserName = (TextView) findViewById(R.id.keyguard_user_name); + mUserName = (TextView) findViewById(R.id.keyguard_user_name); mUserImage.setImageDrawable(Drawable.createFromPath(mUserInfo.iconPath)); mUserName.setText(mUserInfo.name); @@ -89,51 +94,61 @@ class KeyguardMultiUserAvatar extends FrameLayout { public void setActive(boolean active, boolean animate, int duration, final Runnable onComplete) { if (mActive != active || mInit) { mActive = active; - final int finalFilterAlpha = mActive ? 0 : INACTIVE_ALPHA; - final int initFilterAlpha = mActive ? INACTIVE_ALPHA : 0; - - final float finalScale = mActive ? ACTIVE_SCALE : 1.0f; - final float initScale = mActive ? 1.0f : ACTIVE_SCALE; if (active) { KeyguardSubdivisionLayout parent = (KeyguardSubdivisionLayout) getParent(); parent.setTopChild(parent.indexOfChild(this)); } + } + updateVisualsForActive(mActive, animate, duration, true, onComplete); + } - if (animate) { - ValueAnimator va = ValueAnimator.ofFloat(0f, 1f); - va.addUpdateListener(new AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animation) { - float r = animation.getAnimatedFraction(); - float scale = (1 - r) * initScale + r * finalScale; - int filterAlpha = (int) ((1 - r) * initFilterAlpha + r * finalFilterAlpha); - setScaleX(scale); - setScaleY(scale); - mUserImage.setColorFilter(Color.argb(filterAlpha, INACTIVE_COLOR, - INACTIVE_COLOR, INACTIVE_COLOR)); - mUserSelector.invalidate(); - - } - }); - va.addListener(new AnimatorListenerAdapter() { - @Override - public void onAnimationEnd(Animator animation) { - if (onComplete != null) { - onComplete.run(); - } + void updateVisualsForActive(boolean active, boolean animate, int duration, boolean scale, + final Runnable onComplete) { + final float finalAlpha = active ? ACTIVE_ALPHA : INACTIVE_ALPHA; + final float initAlpha = active ? INACTIVE_ALPHA : ACTIVE_ALPHA; + final float finalScale = active && scale ? ACTIVE_SCALE : 1.0f; + final float initScale = active ? 1.0f : ACTIVE_SCALE; + final int finalTextBgAlpha = active ? (int) (ACTIVE_TEXT_BACGROUND_ALPHA * 255) : + (int) (INACTIVE_TEXT_BACGROUND_ALPHA * 255); + final int initTextBgAlpha = active ? (int) (INACTIVE_TEXT_BACGROUND_ALPHA * 255) : + (int) (ACTIVE_TEXT_BACGROUND_ALPHA * 255); + int textColor = active ? mActiveTextColor : mInactiveTextColor; + mUserName.setTextColor(textColor); + + if (animate) { + ValueAnimator va = ValueAnimator.ofFloat(0f, 1f); + va.addUpdateListener(new AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + float r = animation.getAnimatedFraction(); + float scale = (1 - r) * initScale + r * finalScale; + float alpha = (1 - r) * initAlpha + r * finalAlpha; + int textBgAlpha = (int) ((1 - r) * initTextBgAlpha + r * finalTextBgAlpha); + setScaleX(scale); + setScaleY(scale); + mUserImage.setAlpha(alpha); + mUserName.setBackgroundColor(Color.argb(textBgAlpha, 0, 0, 0)); + mUserSelector.invalidate(); + } + }); + va.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + if (onComplete != null) { + onComplete.run(); } - }); - va.setDuration(duration); - va.start(); - } else { - setScaleX(finalScale); - setScaleY(finalScale); - mUserImage.setColorFilter(Color.argb(finalFilterAlpha, INACTIVE_COLOR, - INACTIVE_COLOR, INACTIVE_COLOR)); - if (onComplete != null) { - post(onComplete); } + }); + va.setDuration(duration); + va.start(); + } else { + setScaleX(finalScale); + setScaleY(finalScale); + mUserImage.setAlpha(finalAlpha); + mUserName.setBackgroundColor(Color.argb(finalTextBgAlpha, 0, 0, 0)); + if (onComplete != null) { + post(onComplete); } } } @@ -156,13 +171,7 @@ class KeyguardMultiUserAvatar extends FrameLayout { public void setPressed(boolean pressed) { if (!mPressedStateLocked) { super.setPressed(pressed); - if (pressed) { - mUserImage.setColorFilter(Color.argb(0, INACTIVE_COLOR, - INACTIVE_COLOR, INACTIVE_COLOR)); - } else if (!mActive) { - mUserImage.setColorFilter(Color.argb(INACTIVE_ALPHA, INACTIVE_COLOR, - INACTIVE_COLOR, INACTIVE_COLOR)); - } + updateVisualsForActive(pressed || mActive, false, 0, mActive, null); } else { mTempPressedStateHolder = pressed; } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java index 3b45c227b2b9..82141423f6fa 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardMultiUserSelectorView.java @@ -107,7 +107,8 @@ public class KeyguardMultiUserSelectorView extends FrameLayout implements View.O if (!(v instanceof KeyguardMultiUserAvatar)) return; final KeyguardMultiUserAvatar avatar = (KeyguardMultiUserAvatar) v; if (mActiveUserAvatar == avatar) { - // They clicked the active user, no need to do anything + // If they click the currently active user, show the unlock hint + mCallback.showUnlockHint(); return; } else { // Reset the previously active user to appear inactive diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java index 4f29825d588b..646ab9280947 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardNavigationManager.java @@ -42,11 +42,13 @@ public class KeyguardNavigationManager { public void setMessage(CharSequence msg) { mMessageArea.setText(msg); + mMessageArea.announceForAccessibility(mMessageArea.getText()); } public void setMessage(int resId) { if (resId != 0) { mMessageArea.setText(resId); + mMessageArea.announceForAccessibility(mMessageArea.getText()); } else { mMessageArea.setText(""); } @@ -55,6 +57,7 @@ public class KeyguardNavigationManager { public void setMessage(int resId, Object... formatArgs) { if (resId != 0) { mMessageArea.setText(mMessageArea.getContext().getString(resId, formatArgs)); + mMessageArea.announceForAccessibility(mMessageArea.getText()); } else { mMessageArea.setText(""); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java index 400375481a40..e3b7b0171324 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardSelectorView.java @@ -179,6 +179,10 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri return mGlowPadView.getTargetPosition(resId) != -1; } + public void ping() { + mGlowPadView.ping(); + } + private void updateTargets() { int currentUserHandle = mLockPatternUtils.getCurrentUser(); DevicePolicyManager dpm = mLockPatternUtils.getDevicePolicyManager(); diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java index 866194c8da31..5ad45ce8a5d8 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java @@ -114,7 +114,7 @@ class KeyguardStatusViewManager { mClockView = (ClockView) view.findViewById(R.id.clock_view); // Use custom font in mDateView - mDateView.setTypeface(Typeface.SANS_SERIF); + mDateView.setTypeface(Typeface.SANS_SERIF, Typeface.BOLD); // Required to get Marquee to work. final View marqueeViews[] = { mDateView, mStatus1View, mOwnerInfoView, mAlarmStatusView }; diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java index a3a9c5f56819..23a96fb2e9e6 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java @@ -24,9 +24,11 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.PixelFormat; import android.os.IBinder; +import android.os.Parcelable; import android.os.SystemProperties; import android.util.Log; import android.util.Slog; +import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -34,6 +36,7 @@ import android.view.ViewManager; import android.view.WindowManager; import android.widget.FrameLayout; +import com.android.internal.policy.impl.keyguard.KeyguardSecurityModel.SecurityMode; import com.android.internal.widget.LockPatternUtils; import com.android.internal.R; @@ -89,7 +92,7 @@ public class KeyguardViewManager { boolean enableScreenRotation = shouldEnableScreenRotation(); - maybeCreateKeyguardLocked(enableScreenRotation); + maybeCreateKeyguardLocked(enableScreenRotation, false); maybeEnableScreenRotation(enableScreenRotation); // Disable common aspects of the system/status/navigation bars that are not appropriate or @@ -120,13 +123,19 @@ public class KeyguardViewManager { @Override protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - maybeCreateKeyguardLocked(shouldEnableScreenRotation()); + maybeCreateKeyguardLocked(shouldEnableScreenRotation(), false); } } - private void maybeCreateKeyguardLocked(boolean enableScreenRotation) { + SparseArray<Parcelable> mStateContainer = new SparseArray<Parcelable>(); + + private void maybeCreateKeyguardLocked(boolean enableScreenRotation, boolean userSwitched) { final boolean isActivity = (mContext instanceof Activity); // for test activity + if (mKeyguardHost != null) { + mKeyguardHost.saveHierarchyState(mStateContainer); + } + if (mKeyguardHost == null) { if (DEBUG) Log.d(TAG, "keyguard host is null, creating it..."); @@ -161,11 +170,13 @@ public class KeyguardViewManager { mWindowLayoutParams = lp; mViewManager.addView(mKeyguardHost, lp); } - inflateKeyguardView(); + inflateKeyguardView(userSwitched); mViewManager.updateViewLayout(mKeyguardHost, mWindowLayoutParams); + + mKeyguardHost.restoreHierarchyState(mStateContainer); } - private void inflateKeyguardView() { + private void inflateKeyguardView(boolean userSwitched) { View v = mKeyguardHost.findViewById(R.id.keyguard_host_view); if (v != null) { mKeyguardHost.removeView(v); @@ -179,6 +190,11 @@ public class KeyguardViewManager { mKeyguardView.setLockPatternUtils(mLockPatternUtils); mKeyguardView.setViewMediatorCallback(mViewMediatorCallback); + if (userSwitched) { + mKeyguardView.goToUserSwitcher(); + mKeyguardView.showNextSecurityScreenIfPresent(); + } + if (mScreenOn) { mKeyguardView.show(); } @@ -219,11 +235,11 @@ public class KeyguardViewManager { /** * Reset the state of the view. */ - public synchronized void reset() { + public synchronized void reset(boolean userSwitched) { if (DEBUG) Log.d(TAG, "reset()"); // User might have switched, check if we need to go back to keyguard // TODO: It's preferable to stay and show the correct lockscreen or unlock if none - maybeCreateKeyguardLocked(shouldEnableScreenRotation()); + maybeCreateKeyguardLocked(shouldEnableScreenRotation(), userSwitched); } public synchronized void onScreenTurnedOff() { diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java index 59aed2432322..21d2ad191cd4 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java @@ -291,7 +291,8 @@ public class KeyguardViewMediator { public void onUserSwitched(int userId) { // Note that the mLockPatternUtils user has already been updated from setCurrentUser. synchronized (KeyguardViewMediator.this) { - resetStateLocked(); + adjustStatusBarLocked(); + resetStateLocked(true); } // We should always go back to the locked state when a user // switch happens. Is there a more direct way to do this? @@ -351,7 +352,7 @@ public class KeyguardViewMediator { + "device isn't provisioned yet."); doKeyguardLocked(); } else { - resetStateLocked(); + resetStateLocked(false); } } } @@ -364,7 +365,7 @@ public class KeyguardViewMediator { + "showing; need to show keyguard so user can enter sim pin"); doKeyguardLocked(); } else { - resetStateLocked(); + resetStateLocked(false); } } break; @@ -377,14 +378,14 @@ public class KeyguardViewMediator { } else { if (DEBUG) Log.d(TAG, "PERM_DISABLED, resetStateLocked to" + "show permanently disabled message in lockscreen."); - resetStateLocked(); + resetStateLocked(false); } } break; case READY: synchronized (this) { if (isShowing()) { - resetStateLocked(); + resetStateLocked(false); } } break; @@ -530,7 +531,7 @@ public class KeyguardViewMediator { } } else if (mShowing) { notifyScreenOffLocked(); - resetStateLocked(); + resetStateLocked(false); } else if (why == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT || (why == WindowManagerPolicy.OFF_BECAUSE_OF_USER && !lockImmediately)) { // if the screen turned off because of timeout or the user hit the power button @@ -644,7 +645,7 @@ public class KeyguardViewMediator { if (DEBUG) Log.d(TAG, "onKeyguardExitResult(false), resetting"); mExitSecureCallback.onKeyguardExitResult(false); mExitSecureCallback = null; - resetStateLocked(); + resetStateLocked(false); } else { showLocked(); @@ -805,11 +806,12 @@ public class KeyguardViewMediator { /** * Send message to keyguard telling it to reset its state. + * @param userSwitched true if we're resetting state because user switched * @see #handleReset() */ - private void resetStateLocked() { + private void resetStateLocked(boolean userSwitched) { if (DEBUG) Log.d(TAG, "resetStateLocked"); - Message msg = mHandler.obtainMessage(RESET); + Message msg = mHandler.obtainMessage(RESET, userSwitched ? 1 : 0, 0); mHandler.sendMessage(msg); } @@ -1046,7 +1048,7 @@ public class KeyguardViewMediator { handleHide(); return ; case RESET: - handleReset(); + handleReset(msg.arg1 != 0); return ; case VERIFY_UNLOCK: handleVerifyUnlock(); @@ -1289,13 +1291,13 @@ public class KeyguardViewMediator { } /** - * Handle message sent by {@link #resetStateLocked()} + * Handle message sent by {@link #resetStateLocked(boolean)} * @see #RESET */ - private void handleReset() { + private void handleReset(boolean userSwitched) { synchronized (KeyguardViewMediator.this) { if (DEBUG) Log.d(TAG, "handleReset"); - mKeyguardViewManager.reset(); + mKeyguardViewManager.reset(userSwitched); } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java index d17c12832969..9d9b0431a176 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java @@ -19,13 +19,17 @@ package com.android.internal.policy.impl.keyguard; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.LinearGradient; import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.graphics.drawable.NinePatchDrawable; +import android.graphics.Shader; +import android.os.PowerManager; +import android.os.SystemClock; import android.util.AttributeSet; +import android.view.MotionEvent; import android.widget.FrameLayout; import com.android.internal.R; @@ -33,13 +37,19 @@ import com.android.internal.R; public class KeyguardWidgetFrame extends FrameLayout { private final static PorterDuffXfermode sAddBlendMode = new PorterDuffXfermode(PorterDuff.Mode.ADD); - private static Drawable sLeftOverscrollDrawable; - private static Drawable sRightOverscrollDrawable; - private Drawable mForegroundDrawable; + private int mGradientColor; + private LinearGradient mForegroundGradient; + private LinearGradient mLeftToRightGradient; + private LinearGradient mRightToLeftGradient; + private Paint mGradientPaint = new Paint(); + boolean mLeftToRight = true; + private float mOverScrollAmount = 0f; private final Rect mForegroundRect = new Rect(); private int mForegroundAlpha = 0; + private PowerManager mPowerManager; + private boolean mDisableInteraction; public KeyguardWidgetFrame(Context context) { this(context, null, 0); @@ -51,28 +61,42 @@ public class KeyguardWidgetFrame extends FrameLayout { public KeyguardWidgetFrame(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - Resources res = context.getResources(); - if (sLeftOverscrollDrawable == null) { - sLeftOverscrollDrawable = res.getDrawable(R.drawable.kg_widget_overscroll_layer_left); - sRightOverscrollDrawable = res.getDrawable(R.drawable.kg_widget_overscroll_layer_right); - } + mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); + + Resources res = context.getResources(); int hPadding = res.getDimensionPixelSize(R.dimen.kg_widget_pager_horizontal_padding); int topPadding = res.getDimensionPixelSize(R.dimen.kg_widget_pager_top_padding); int bottomPadding = res.getDimensionPixelSize(R.dimen.kg_widget_pager_bottom_padding); setPadding(hPadding, topPadding, hPadding, bottomPadding); + mGradientColor = res.getColor(R.color.kg_widget_pager_gradient); + mGradientPaint.setXfermode(sAddBlendMode); + } + + public void setDisableUserInteraction(boolean disabled) { + mDisableInteraction = disabled; + } + + @Override + public boolean onInterceptTouchEvent(MotionEvent ev) { + if (!mDisableInteraction) { + mPowerManager.userActivity(SystemClock.uptimeMillis(), false); + return super.onInterceptTouchEvent(ev); + } + return true; } @Override protected void dispatchDraw(Canvas canvas) { super.dispatchDraw(canvas); - if (mForegroundAlpha > 0) { - mForegroundDrawable.setBounds(mForegroundRect); - Paint p = ((NinePatchDrawable) mForegroundDrawable).getPaint(); - p.setXfermode(sAddBlendMode); - mForegroundDrawable.draw(canvas); - p.setXfermode(null); - } + drawGradientOverlay(canvas); + + } + + private void drawGradientOverlay(Canvas c) { + mGradientPaint.setShader(mForegroundGradient); + mGradientPaint.setAlpha(mForegroundAlpha); + c.drawRect(mForegroundRect, mGradientPaint); } @Override @@ -80,27 +104,20 @@ public class KeyguardWidgetFrame extends FrameLayout { super.onSizeChanged(w, h, oldw, oldh); mForegroundRect.set(getPaddingLeft(), getPaddingTop(), w - getPaddingRight(), h - getPaddingBottom()); + float x0 = mLeftToRight ? 0 : mForegroundRect.width(); + float x1 = mLeftToRight ? mForegroundRect.width(): 0; + mLeftToRightGradient = new LinearGradient(x0, 0f, x1, 0f, + mGradientColor, 0, Shader.TileMode.CLAMP); + mRightToLeftGradient = new LinearGradient(x1, 0f, x0, 0f, + mGradientColor, 0, Shader.TileMode.CLAMP); } void setOverScrollAmount(float r, boolean left) { if (Float.compare(mOverScrollAmount, r) != 0) { mOverScrollAmount = r; - if (left && mForegroundDrawable != sLeftOverscrollDrawable) { - mForegroundDrawable = sLeftOverscrollDrawable; - } else if (!left && mForegroundDrawable != sRightOverscrollDrawable) { - mForegroundDrawable = sRightOverscrollDrawable; - } - - mForegroundAlpha = (int) Math.round((r * 255)); - mForegroundDrawable.setAlpha(mForegroundAlpha); - if (getLayerType() != LAYER_TYPE_HARDWARE) { - setLayerType(LAYER_TYPE_HARDWARE, null); - } + mForegroundGradient = left ? mLeftToRightGradient : mRightToLeftGradient; + mForegroundAlpha = (int) Math.round((0.85f * r * 255)); invalidate(); - } else { - if (getLayerType() != LAYER_TYPE_NONE) { - setLayerType(LAYER_TYPE_NONE, null); - } } } } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java index 4af7a2588a11..9dfbba809683 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java @@ -27,6 +27,8 @@ import android.view.animation.DecelerateInterpolator; import android.widget.FrameLayout; +import com.android.internal.R; + public class KeyguardWidgetPager extends PagedView { ZInterpolator mZInterpolator = new ZInterpolator(0.5f); private static float CAMERA_DISTANCE = 10000; @@ -47,6 +49,9 @@ public class KeyguardWidgetPager extends PagedView { public KeyguardWidgetPager(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); + if (getImportantForAccessibility() == View.IMPORTANT_FOR_ACCESSIBILITY_AUTO) { + setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); + } } /* @@ -60,6 +65,7 @@ public class KeyguardWidgetPager extends PagedView { // The framework adds a default padding to AppWidgetHostView. We don't need this padding // for the Keyguard, so we override it to be 0. widget.setPadding(0, 0, 0, 0); + widget.setContentDescription(widget.getAppWidgetInfo().label); frame.addView(widget, lp); addView(frame); } @@ -70,6 +76,25 @@ public class KeyguardWidgetPager extends PagedView { } } + @Override + protected void onPageBeginMoving() { + // Enable hardware layers while pages are moving + // TODO: We should only do this for the two views that are actually moving + int children = getChildCount(); + for (int i = 0; i < children; i++) { + getChildAt(i).setLayerType(LAYER_TYPE_HARDWARE, null); + } + } + + @Override + protected void onPageEndMoving() { + // Disable hardware layers while pages are moving + int children = getChildCount(); + for (int i = 0; i < children; i++) { + getChildAt(i).setLayerType(LAYER_TYPE_NONE, null); + } + } + /* * This interpolator emulates the rate at which the perceived scale of an object changes * as its distance from a camera increases. When this interpolator is applied to a scale @@ -90,6 +115,21 @@ public class KeyguardWidgetPager extends PagedView { } @Override + public String getCurrentPageDescription() { + final int nextPageIndex = getNextPage(); + if (nextPageIndex >= 0 && nextPageIndex < getChildCount()) { + KeyguardWidgetFrame frame = (KeyguardWidgetFrame) getChildAt(nextPageIndex); + CharSequence title = frame.getChildAt(0).getContentDescription(); + if (title == null) { + title = ""; + } + return mContext.getString(R.string.keyguard_accessibility_widget_changed, + title, nextPageIndex + 1, getChildCount()); + } + return super.getCurrentPageDescription(); + } + + @Override protected void overScroll(float amount) { acceleratedOverScroll(amount); } diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetRegion.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetRegion.java index f7f23c714528..e9ea2c37b22b 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetRegion.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetRegion.java @@ -16,6 +16,8 @@ package com.android.internal.policy.impl.keyguard; import android.content.Context; +import android.os.PowerManager; +import android.os.SystemClock; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; @@ -29,6 +31,7 @@ public class KeyguardWidgetRegion extends LinearLayout implements PageSwitchList KeyguardGlowStripView mRightStrip; KeyguardWidgetPager mPager; private int mPage = 0; + private PowerManager mPowerManager; public KeyguardWidgetRegion(Context context) { this(context, null, 0); @@ -40,6 +43,7 @@ public class KeyguardWidgetRegion extends LinearLayout implements PageSwitchList public KeyguardWidgetRegion(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); + mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); } @Override @@ -70,21 +74,25 @@ public class KeyguardWidgetRegion extends LinearLayout implements PageSwitchList @Override public void onPageSwitch(View newPage, int newPageIndex) { - mPage = newPageIndex; - - // If we're showing the default system status widget, then we want to hide the clock - boolean hideClock = false; + boolean showingStatusWidget = false; if ((newPage instanceof ViewGroup)) { ViewGroup vg = (ViewGroup) newPage; if (vg.getChildAt(0) instanceof KeyguardStatusView) { - hideClock = true; + showingStatusWidget = true; } } - if (hideClock) { + // Disable the status bar clock if we're showing the default status widget + if (showingStatusWidget) { setSystemUiVisibility(getSystemUiVisibility() | View.STATUS_BAR_DISABLE_CLOCK); } else { setSystemUiVisibility(getSystemUiVisibility() & ~View.STATUS_BAR_DISABLE_CLOCK); } + + // Extend the display timeout if the user switches pages + if (mPage != newPageIndex) { + mPowerManager.userActivity(SystemClock.uptimeMillis(), false); + mPage = newPageIndex; + } } } diff --git a/services/java/com/android/server/BatteryService.java b/services/java/com/android/server/BatteryService.java index 0b4871df4e49..40758d31b03d 100644 --- a/services/java/com/android/server/BatteryService.java +++ b/services/java/com/android/server/BatteryService.java @@ -40,11 +40,9 @@ import android.util.Slog; import java.io.File; import java.io.FileDescriptor; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; -import java.util.Arrays; /** @@ -69,12 +67,12 @@ import java.util.Arrays; * a degree Centigrade</p> * <p>"technology" - String, the type of battery installed, e.g. "Li-ion"</p> */ -public class BatteryService extends Binder { +public final class BatteryService extends Binder { private static final String TAG = BatteryService.class.getSimpleName(); - private static final boolean LOCAL_LOGV = false; + private static final boolean DEBUG = false; - static final int BATTERY_SCALE = 100; // battery capacity is a percentage + private static final int BATTERY_SCALE = 100; // battery capacity is a percentage // Used locally for determining when to make a last ditch effort to log // discharge stats before the device dies. @@ -92,6 +90,9 @@ public class BatteryService extends Binder { private final Context mContext; private final IBatteryStats mBatteryStats; + private final Object mLock = new Object(); + + /* Begin native fields: All of these fields are set by native code. */ private boolean mAcOnline; private boolean mUsbOnline; private boolean mWirelessOnline; @@ -103,7 +104,7 @@ public class BatteryService extends Binder { private int mBatteryTemperature; private String mBatteryTechnology; private boolean mBatteryLevelCritical; - private int mInvalidCharger; + /* End native fields. */ private int mLastBatteryStatus; private int mLastBatteryHealth; @@ -112,6 +113,8 @@ public class BatteryService extends Binder { private int mLastBatteryVoltage; private int mLastBatteryTemperature; private boolean mLastBatteryLevelCritical; + + private int mInvalidCharger; private int mLastInvalidCharger; private int mLowBatteryWarningLevel; @@ -124,10 +127,14 @@ public class BatteryService extends Binder { private long mDischargeStartTime; private int mDischargeStartLevel; + private boolean mUpdatesStopped; + private Led mLed; private boolean mSentLowBatteryBroadcast = false; + private native void native_update(); + public BatteryService(Context context, LightsService lights) { mContext = context; mLed = new Led(context, lights); @@ -146,91 +153,91 @@ public class BatteryService extends Binder { // watch for invalid charger messages if the invalid_charger switch exists if (new File("/sys/devices/virtual/switch/invalid_charger/state").exists()) { - mInvalidChargerObserver.startObserving("DEVPATH=/devices/virtual/switch/invalid_charger"); + mInvalidChargerObserver.startObserving( + "DEVPATH=/devices/virtual/switch/invalid_charger"); } // set initial status - update(); + synchronized (mLock) { + updateLocked(); + } } - public final boolean isPowered() { - // assume we are powered if battery state is unknown so the "stay on while plugged in" option will work. - return (mAcOnline || mUsbOnline || mWirelessOnline - || mBatteryStatus == BatteryManager.BATTERY_STATUS_UNKNOWN); + void systemReady() { + // check our power situation now that it is safe to display the shutdown dialog. + synchronized (mLock) { + shutdownIfNoPowerLocked(); + shutdownIfOverTempLocked(); + } + } + + /** + * Returns true if the device is plugged into any of the specified plug types. + */ + public boolean isPowered(int plugTypeSet) { + synchronized (mLock) { + return isPoweredLocked(plugTypeSet); + } } - public final boolean isPowered(int plugTypeSet) { + private boolean isPoweredLocked(int plugTypeSet) { // assume we are powered if battery state is unknown so // the "stay on while plugged in" option will work. if (mBatteryStatus == BatteryManager.BATTERY_STATUS_UNKNOWN) { return true; } - if (plugTypeSet == 0) { - return false; - } - int plugTypeBit = 0; - if (mAcOnline) { - plugTypeBit |= BatteryManager.BATTERY_PLUGGED_AC; + if ((plugTypeSet & BatteryManager.BATTERY_PLUGGED_AC) != 0 && mAcOnline) { + return true; } - if (mUsbOnline) { - plugTypeBit |= BatteryManager.BATTERY_PLUGGED_USB; + if ((plugTypeSet & BatteryManager.BATTERY_PLUGGED_USB) != 0 && mUsbOnline) { + return true; } - if (mWirelessOnline) { - plugTypeBit |= BatteryManager.BATTERY_PLUGGED_WIRELESS; + if ((plugTypeSet & BatteryManager.BATTERY_PLUGGED_WIRELESS) != 0 && mWirelessOnline) { + return true; } - return (plugTypeSet & plugTypeBit) != 0; - } - - public final int getPlugType() { - return mPlugType; + return false; } - private UEventObserver mPowerSupplyObserver = new UEventObserver() { - @Override - public void onUEvent(UEventObserver.UEvent event) { - update(); + /** + * Returns the current plug type. + */ + public int getPlugType() { + synchronized (mLock) { + return mPlugType; } - }; - - private UEventObserver mInvalidChargerObserver = new UEventObserver() { - @Override - public void onUEvent(UEventObserver.UEvent event) { - int invalidCharger = "1".equals(event.get("SWITCH_STATE")) ? 1 : 0; - if (mInvalidCharger != invalidCharger) { - mInvalidCharger = invalidCharger; - update(); - } - } - }; - - // returns battery level as a percentage - public final int getBatteryLevel() { - return mBatteryLevel; } - // true if battery level is below the first warning threshold - public final boolean isBatteryLow() { - return mBatteryPresent && mBatteryLevel <= mLowBatteryWarningLevel; + /** + * Returns battery level as a percentage. + */ + public int getBatteryLevel() { + synchronized (mLock) { + return mBatteryLevel; + } } - void systemReady() { - // check our power situation now that it is safe to display the shutdown dialog. - shutdownIfNoPower(); - shutdownIfOverTemp(); + /** + * Returns true if battery level is below the first warning threshold. + */ + public boolean isBatteryLow() { + synchronized (mLock) { + return mBatteryPresent && mBatteryLevel <= mLowBatteryWarningLevel; + } } - private final void shutdownIfNoPower() { + private void shutdownIfNoPowerLocked() { // shut down gracefully if our battery is critically low and we are not powered. // wait until the system has booted before attempting to display the shutdown dialog. - if (mBatteryLevel == 0 && !isPowered() && ActivityManagerNative.isSystemReady()) { + if (mBatteryLevel == 0 && !isPoweredLocked(BatteryManager.BATTERY_PLUGGED_ANY) + && ActivityManagerNative.isSystemReady()) { Intent intent = new Intent(Intent.ACTION_REQUEST_SHUTDOWN); intent.putExtra(Intent.EXTRA_KEY_CONFIRM, false); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - mContext.startActivity(intent); + mContext.startActivityAsUser(intent, UserHandle.CURRENT); } } - private final void shutdownIfOverTemp() { + private void shutdownIfOverTempLocked() { // shut down gracefully if temperature is too high (> 68.0C by default) // wait until the system has booted before attempting to display the // shutdown dialog. @@ -239,22 +246,25 @@ public class BatteryService extends Binder { Intent intent = new Intent(Intent.ACTION_REQUEST_SHUTDOWN); intent.putExtra(Intent.EXTRA_KEY_CONFIRM, false); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - mContext.startActivity(intent); + mContext.startActivityAsUser(intent, UserHandle.CURRENT); } } - private native void native_update(); + private void updateLocked() { + if (!mUpdatesStopped) { + // Update the values of mAcOnline, et. all. + native_update(); - private synchronized final void update() { - native_update(); - processValues(); + // Process the new values. + processValuesLocked(); + } } - private void processValues() { + private void processValuesLocked() { boolean logOutlier = false; long dischargeDuration = 0; - mBatteryLevelCritical = mBatteryLevel <= mCriticalBatteryLevel; + mBatteryLevelCritical = (mBatteryLevel <= mCriticalBatteryLevel); if (mAcOnline) { mPlugType = BatteryManager.BATTERY_PLUGGED_AC; } else if (mUsbOnline) { @@ -265,6 +275,22 @@ public class BatteryService extends Binder { mPlugType = BATTERY_PLUGGED_NONE; } + if (DEBUG) { + Slog.d(TAG, "Processing new values: " + + "mAcOnline=" + mAcOnline + + ", mUsbOnline=" + mUsbOnline + + ", mWirelessOnline=" + mWirelessOnline + + ", mBatteryStatus=" + mBatteryStatus + + ", mBatteryHealth=" + mBatteryHealth + + ", mBatteryPresent=" + mBatteryPresent + + ", mBatteryLevel=" + mBatteryLevel + + ", mBatteryTechnology=" + mBatteryTechnology + + ", mBatteryVoltage=" + mBatteryVoltage + + ", mBatteryTemperature=" + mBatteryTemperature + + ", mBatteryLevelCritical=" + mBatteryLevelCritical + + ", mPlugType=" + mPlugType); + } + // Let the battery stats keep track of the current level. try { mBatteryStats.setBatteryState(mBatteryStatus, mBatteryHealth, @@ -274,8 +300,8 @@ public class BatteryService extends Binder { // Should never happen. } - shutdownIfNoPower(); - shutdownIfOverTemp(); + shutdownIfNoPowerLocked(); + shutdownIfOverTempLocked(); if (mBatteryStatus != mLastBatteryStatus || mBatteryHealth != mLastBatteryHealth || @@ -342,7 +368,7 @@ public class BatteryService extends Binder { && mBatteryLevel <= mLowBatteryWarningLevel && (oldPlugged || mLastBatteryLevel > mLowBatteryWarningLevel); - sendIntent(); + sendIntentLocked(); // Separate broadcast is sent for power connected / not connected // since the standard intent will not wake any applications and some @@ -373,7 +399,7 @@ public class BatteryService extends Binder { // This needs to be done after sendIntent() so that we get the lastest battery stats. if (logOutlier && dischargeDuration != 0) { - logOutlier(dischargeDuration); + logOutlierLocked(dischargeDuration); } mLastBatteryStatus = mBatteryStatus; @@ -388,13 +414,13 @@ public class BatteryService extends Binder { } } - private final void sendIntent() { + private void sendIntentLocked() { // Pack up the values and broadcast them to everyone Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_REPLACE_PENDING); - int icon = getIcon(mBatteryLevel); + int icon = getIconLocked(mBatteryLevel); intent.putExtra(BatteryManager.EXTRA_STATUS, mBatteryStatus); intent.putExtra(BatteryManager.EXTRA_HEALTH, mBatteryHealth); @@ -408,22 +434,22 @@ public class BatteryService extends Binder { intent.putExtra(BatteryManager.EXTRA_TECHNOLOGY, mBatteryTechnology); intent.putExtra(BatteryManager.EXTRA_INVALID_CHARGER, mInvalidCharger); - if (false) { - Slog.d(TAG, "level:" + mBatteryLevel + - " scale:" + BATTERY_SCALE + " status:" + mBatteryStatus + - " health:" + mBatteryHealth + " present:" + mBatteryPresent + - " voltage: " + mBatteryVoltage + - " temperature: " + mBatteryTemperature + - " technology: " + mBatteryTechnology + - " AC powered:" + mAcOnline + " USB powered:" + mUsbOnline + - " Wireless powered:" + mWirelessOnline + - " icon:" + icon + " invalid charger:" + mInvalidCharger); + if (DEBUG) { + Slog.d(TAG, "Sending ACTION_BATTERY_CHANGED. level:" + mBatteryLevel + + ", scale:" + BATTERY_SCALE + ", status:" + mBatteryStatus + + ", health:" + mBatteryHealth + ", present:" + mBatteryPresent + + ", voltage: " + mBatteryVoltage + + ", temperature: " + mBatteryTemperature + + ", technology: " + mBatteryTechnology + + ", AC powered:" + mAcOnline + ", USB powered:" + mUsbOnline + + ", Wireless powered:" + mWirelessOnline + + ", icon:" + icon + ", invalid charger:" + mInvalidCharger); } ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.USER_ALL); } - private final void logBatteryStats() { + private void logBatteryStatsLocked() { IBinder batteryInfoService = ServiceManager.getService(BATTERY_STATS_SERVICE_NAME); if (batteryInfoService == null) return; @@ -461,7 +487,7 @@ public class BatteryService extends Binder { } } - private final void logOutlier(long duration) { + private void logOutlierLocked(long duration) { ContentResolver cr = mContext.getContentResolver(); String dischargeThresholdString = Settings.Global.getString(cr, Settings.Global.BATTERY_DISCHARGE_THRESHOLD); @@ -475,11 +501,11 @@ public class BatteryService extends Binder { if (duration <= durationThreshold && mDischargeStartLevel - mBatteryLevel >= dischargeThreshold) { // If the discharge cycle is bad enough we want to know about it. - logBatteryStats(); + logBatteryStatsLocked(); } - if (LOCAL_LOGV) Slog.v(TAG, "duration threshold: " + durationThreshold + + if (DEBUG) Slog.v(TAG, "duration threshold: " + durationThreshold + " discharge threshold: " + dischargeThreshold); - if (LOCAL_LOGV) Slog.v(TAG, "duration: " + duration + " discharge: " + + if (DEBUG) Slog.v(TAG, "duration: " + duration + " discharge: " + (mDischargeStartLevel - mBatteryLevel)); } catch (NumberFormatException e) { Slog.e(TAG, "Invalid DischargeThresholds GService string: " + @@ -489,14 +515,15 @@ public class BatteryService extends Binder { } } - private final int getIcon(int level) { + private int getIconLocked(int level) { if (mBatteryStatus == BatteryManager.BATTERY_STATUS_CHARGING) { return com.android.internal.R.drawable.stat_sys_battery_charge; } else if (mBatteryStatus == BatteryManager.BATTERY_STATUS_DISCHARGING) { return com.android.internal.R.drawable.stat_sys_battery; } else if (mBatteryStatus == BatteryManager.BATTERY_STATUS_NOT_CHARGING || mBatteryStatus == BatteryManager.BATTERY_STATUS_FULL) { - if (isPowered() && mBatteryLevel >= 100) { + if (isPoweredLocked(BatteryManager.BATTERY_PLUGGED_ANY) + && mBatteryLevel >= 100) { return com.android.internal.R.drawable.stat_sys_battery_charge; } else { return com.android.internal.R.drawable.stat_sys_battery; @@ -517,9 +544,12 @@ public class BatteryService extends Binder { return; } - if (args == null || args.length == 0 || "-a".equals(args[0])) { - synchronized (this) { + synchronized (mLock) { + if (args == null || args.length == 0 || "-a".equals(args[0])) { pw.println("Current Battery Service state:"); + if (mUpdatesStopped) { + pw.println(" (UPDATES STOPPED -- use 'reset' to restart)"); + } pw.println(" AC powered: " + mAcOnline); pw.println(" USB powered: " + mUsbOnline); pw.println(" Wireless powered: " + mWirelessOnline); @@ -531,10 +561,7 @@ public class BatteryService extends Binder { pw.println(" voltage:" + mBatteryVoltage); pw.println(" temperature: " + mBatteryTemperature); pw.println(" technology: " + mBatteryTechnology); - } - } else if (false) { - // DO NOT SUBMIT WITH THIS TURNED ON - if (args.length == 3 && "set".equals(args[0])) { + } else if (args.length == 3 && "set".equals(args[0])) { String key = args[1]; String value = args[2]; try { @@ -552,52 +579,77 @@ public class BatteryService extends Binder { } else if ("invalid".equals(key)) { mInvalidCharger = Integer.parseInt(value); } else { + pw.println("Unknown set option: " + key); update = false; } if (update) { - processValues(); + mUpdatesStopped = true; + processValuesLocked(); } } catch (NumberFormatException ex) { pw.println("Bad value: " + value); } + } else if (args.length == 1 && "reset".equals(args[0])) { + mUpdatesStopped = false; + updateLocked(); + } else { + pw.println("Dump current battery state, or:"); + pw.println(" set ac|usb|wireless|status|level|invalid <value>"); + pw.println(" reset"); } } } - class Led { - private LightsService mLightsService; - private LightsService.Light mBatteryLight; + private final UEventObserver mPowerSupplyObserver = new UEventObserver() { + @Override + public void onUEvent(UEventObserver.UEvent event) { + synchronized (mLock) { + updateLocked(); + } + } + }; + + private final UEventObserver mInvalidChargerObserver = new UEventObserver() { + @Override + public void onUEvent(UEventObserver.UEvent event) { + final int invalidCharger = "1".equals(event.get("SWITCH_STATE")) ? 1 : 0; + synchronized (mLock) { + if (mInvalidCharger != invalidCharger) { + mInvalidCharger = invalidCharger; + updateLocked(); + } + } + } + }; - private int mBatteryLowARGB; - private int mBatteryMediumARGB; - private int mBatteryFullARGB; - private int mBatteryLedOn; - private int mBatteryLedOff; + private final class Led { + private final LightsService.Light mBatteryLight; - private boolean mBatteryCharging; - private boolean mBatteryLow; - private boolean mBatteryFull; + private final int mBatteryLowARGB; + private final int mBatteryMediumARGB; + private final int mBatteryFullARGB; + private final int mBatteryLedOn; + private final int mBatteryLedOff; - Led(Context context, LightsService lights) { - mLightsService = lights; + public Led(Context context, LightsService lights) { mBatteryLight = lights.getLight(LightsService.LIGHT_ID_BATTERY); - mBatteryLowARGB = mContext.getResources().getInteger( + mBatteryLowARGB = context.getResources().getInteger( com.android.internal.R.integer.config_notificationsBatteryLowARGB); - mBatteryMediumARGB = mContext.getResources().getInteger( + mBatteryMediumARGB = context.getResources().getInteger( com.android.internal.R.integer.config_notificationsBatteryMediumARGB); - mBatteryFullARGB = mContext.getResources().getInteger( + mBatteryFullARGB = context.getResources().getInteger( com.android.internal.R.integer.config_notificationsBatteryFullARGB); - mBatteryLedOn = mContext.getResources().getInteger( + mBatteryLedOn = context.getResources().getInteger( com.android.internal.R.integer.config_notificationsBatteryLedOn); - mBatteryLedOff = mContext.getResources().getInteger( + mBatteryLedOff = context.getResources().getInteger( com.android.internal.R.integer.config_notificationsBatteryLedOff); } /** * Synchronize on BatteryService. */ - void updateLightsLocked() { + public void updateLightsLocked() { final int level = mBatteryLevel; final int status = mBatteryStatus; if (level < mLowBatteryWarningLevel) { diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index 9607624316c3..b2de9632f6dd 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -401,6 +401,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } else if ("disable-camera".equals(tag)) { disableCamera = Boolean.parseBoolean( parser.getAttributeValue(null, "value")); + } else if ("disable-keyguard-features".equals(tag)) { + disabledKeyguardFeatures = Integer.parseInt( + parser.getAttributeValue(null, "value")); } else { Slog.w(TAG, "Unknown admin tag: " + tag); } @@ -457,6 +460,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { pw.println(encryptionRequested); pw.print(prefix); pw.print("disableCamera="); pw.println(disableCamera); + pw.print(prefix); pw.print("disabledKeyguardFeatures="); + pw.println(disabledKeyguardFeatures); } } diff --git a/services/java/com/android/server/DeviceStorageMonitorService.java b/services/java/com/android/server/DeviceStorageMonitorService.java index a4c376d29ed9..94a087a0c756 100644 --- a/services/java/com/android/server/DeviceStorageMonitorService.java +++ b/services/java/com/android/server/DeviceStorageMonitorService.java @@ -405,7 +405,7 @@ public class DeviceStorageMonitorService extends Binder { notification.setLatestEventInfo(mContext, title, details, intent); mNotificationMgr.notifyAsUser(null, LOW_MEMORY_NOTIFICATION_ID, notification, UserHandle.ALL); - mContext.sendStickyBroadcast(mStorageLowIntent); + mContext.sendStickyBroadcastAsUser(mStorageLowIntent, UserHandle.ALL); } /** @@ -428,7 +428,7 @@ public class DeviceStorageMonitorService extends Binder { */ private final void sendFullNotification() { if(localLOGV) Slog.i(TAG, "Sending memory full notification"); - mContext.sendStickyBroadcast(mStorageFullIntent); + mContext.sendStickyBroadcastAsUser(mStorageFullIntent, UserHandle.ALL); } /** diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index f06bf8e28e9e..22fd5083fe0d 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -1843,7 +1843,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (mCurFocusedWindow == windowToken) { Slog.w(TAG, "Window already focused, ignoring focus gain of: " + client - + " attribute=" + attribute); + + " attribute=" + attribute + ", token = " + windowToken); if (attribute != null) { return startInputUncheckedLocked(cs, inputContext, attribute, controlFlags); diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index 2197e3122269..3cea295aeb5c 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -645,12 +645,11 @@ public class LocationManagerService extends ILocationManager.Stub implements Run /** * Returns all providers by name, including passive, but excluding - * fused. + * fused, also including ones that are not permitted to + * be accessed by the calling activity or are currently disabled. */ @Override public List<String> getAllProviders() { - checkPermission(); - ArrayList<String> out; synchronized (mLock) { out = new ArrayList<String>(mProviders.size()); @@ -1293,8 +1292,13 @@ public class LocationManagerService extends ILocationManager.Stub implements Run @Override public boolean isProviderEnabled(String provider) { - checkPermission(); + String perms = checkPermission(); if (LocationManager.FUSED_PROVIDER.equals(provider)) return false; + if (ACCESS_COARSE_LOCATION.equals(perms) && + !isProviderAllowedByCoarsePermission(provider)) { + throw new SecurityException("The \"" + provider + + "\" provider requires ACCESS_FINE_LOCATION permission"); + } synchronized (mLock) { LocationProviderInterface p = mProvidersByName.get(provider); diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 5d5f8d37d222..8d6c60446a8a 100755 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -1240,7 +1240,7 @@ public class NotificationManagerService extends INotificationManager.Stub if ((r.notification.flags & mustNotHaveFlags) != 0) { continue; } - if (!r.pkg.equals(pkg)) { + if (pkg != null && !r.pkg.equals(pkg)) { continue; } canceledSomething = true; diff --git a/services/java/com/android/server/ShutdownActivity.java b/services/java/com/android/server/ShutdownActivity.java index a4341b7b39c7..be651417150f 100644 --- a/services/java/com/android/server/ShutdownActivity.java +++ b/services/java/com/android/server/ShutdownActivity.java @@ -17,9 +17,13 @@ package com.android.server; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.Handler; +import android.os.IPowerManager; +import android.os.RemoteException; +import android.os.ServiceManager; import android.util.Slog; import com.android.server.power.ShutdownThread; @@ -39,15 +43,27 @@ public class ShutdownActivity extends Activity { mConfirm = intent.getBooleanExtra(Intent.EXTRA_KEY_CONFIRM, false); Slog.i(TAG, "onCreate(): confirm=" + mConfirm); - Handler h = new Handler(); - h.post(new Runnable() { + Thread thr = new Thread("ShutdownActivity") { + @Override public void run() { - if (mReboot) { - ShutdownThread.reboot(ShutdownActivity.this, null, mConfirm); - } else { - ShutdownThread.shutdown(ShutdownActivity.this, mConfirm); + IPowerManager pm = IPowerManager.Stub.asInterface( + ServiceManager.getService(Context.POWER_SERVICE)); + try { + if (mReboot) { + pm.reboot(mConfirm, null, false); + } else { + pm.shutdown(mConfirm, false); + } + } catch (RemoteException e) { } } - }); + }; + thr.start(); + finish(); + // Wait for us to tell the power manager to shutdown. + try { + thr.join(); + } catch (InterruptedException e) { + } } } diff --git a/services/java/com/android/server/StatusBarManagerService.java b/services/java/com/android/server/StatusBarManagerService.java index 5d9441b842ef..439eebe7bca4 100644 --- a/services/java/com/android/server/StatusBarManagerService.java +++ b/services/java/com/android/server/StatusBarManagerService.java @@ -544,7 +544,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub int i; for (i=0; i<N; i++) { DisableRecord t = mDisableRecords.get(i); - if (t.token == token) { + if (t.token == token && t.userId == userId) { tok = t; break; } diff --git a/services/java/com/android/server/Watchdog.java b/services/java/com/android/server/Watchdog.java index 9dbe50352d8e..8bbf923adaea 100644 --- a/services/java/com/android/server/Watchdog.java +++ b/services/java/com/android/server/Watchdog.java @@ -26,6 +26,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.os.BatteryManager; import android.os.Debug; import android.os.Handler; import android.os.Message; @@ -304,7 +305,7 @@ public class Watchdog extends Thread { void rebootSystem(String reason) { Slog.i(TAG, "Rebooting system because: " + reason); PowerManagerService pms = (PowerManagerService) ServiceManager.getService("power"); - pms.reboot(reason); + pms.reboot(false, reason, false); } /** @@ -329,7 +330,7 @@ public class Watchdog extends Thread { * text of why it is not a good time. */ String shouldWeBeBrutalLocked(long curTime) { - if (mBattery == null || !mBattery.isPowered()) { + if (mBattery == null || !mBattery.isPowered(BatteryManager.BATTERY_PLUGGED_ANY)) { return "battery"; } diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java index d23e5714804b..5e9e223dacb8 100644 --- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -2134,9 +2134,30 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { private int mActiveWindowId; private boolean canDispatchAccessibilityEvent(AccessibilityEvent event) { - // Send window changed event only for the retrieval allowing window. - return (event.getEventType() != AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED - || event.getWindowId() == mActiveWindowId); + final int eventType = event.getEventType(); + switch (eventType) { + // All events that are for changes in a global window + // state should *always* be dispatched. + case AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED: + case AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED: + // All events generated by the user touching the + // screen should *always* be dispatched. + case AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START: + case AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END: + case AccessibilityEvent.TYPE_GESTURE_DETECTION_START: + case AccessibilityEvent.TYPE_GESTURE_DETECTION_END: + case AccessibilityEvent.TYPE_TOUCH_INTERACTION_START: + case AccessibilityEvent.TYPE_TOUCH_INTERACTION_END: + // These will change the active window, so dispatch. + case AccessibilityEvent.TYPE_VIEW_HOVER_ENTER: + case AccessibilityEvent.TYPE_VIEW_HOVER_EXIT: { + return true; + } + // All events for changes in window content should be + // dispatched *only* if this window is the active one. + default: + return event.getWindowId() == mActiveWindowId; + } } public void updateEventSourceLocked(AccessibilityEvent event) { diff --git a/services/java/com/android/server/accessibility/TouchExplorer.java b/services/java/com/android/server/accessibility/TouchExplorer.java index 616bc131b825..b3bf6fee9c3c 100644 --- a/services/java/com/android/server/accessibility/TouchExplorer.java +++ b/services/java/com/android/server/accessibility/TouchExplorer.java @@ -102,10 +102,6 @@ class TouchExplorer implements EventStreamTransformation { // The timeout after which we are no longer trying to detect a gesture. private static final int EXIT_GESTURE_DETECTION_TIMEOUT = 2000; - // The timeout to send interaction end events in case we did not - // receive the expected hover exit event due to a misbehaving app. - private static final int SEND_INTERACTION_END_EVENTS_TIMEOUT = 200; - // Temporary array for storing pointer IDs. private final int[] mTempPointerIds = new int[MAX_POINTER_COUNT]; @@ -139,8 +135,11 @@ class TouchExplorer implements EventStreamTransformation { // Command for delayed sending of a hover exit event. private final SendHoverDelayed mSendHoverExitDelayed; - // Command for delayed sending of interaction ending events. - private final SendInteractionEndEventsDelayed mSendInteractionEndEventsDelayed; + // Command for delayed sending of touch exploration end events. + private final SendAccessibilityEventDelayed mSendTouchExplorationEndDelayed; + + // Command for delayed sending of touch interaction end events. + private final SendAccessibilityEventDelayed mSendTouchInteractionEndDelayed; // Command for delayed sending of a long press. private final PerformLongPressDelayed mPerformLongPressDelayed; @@ -198,7 +197,7 @@ class TouchExplorer implements EventStreamTransformation { private GestureLibrary mGestureLibrary; // The long pressing pointer id if coordinate remapping is needed. - private int mLongPressingPointerId; + private int mLongPressingPointerId = -1; // The long pressing pointer X if coordinate remapping is needed. private int mLongPressingPointerDeltaX; @@ -209,11 +208,8 @@ class TouchExplorer implements EventStreamTransformation { // The id of the last touch explored window. private int mLastTouchedWindowId; - // Whether touch exploration gesture has ended. - private boolean mTouchExplorationGestureEnded; - - // Whether touch interaction has ended. - private boolean mTouchInteractionEnded; + // Whether touch exploration is in progress. + private boolean mTouchExplorationInProgress; /** * Creates a new instance. @@ -240,7 +236,12 @@ class TouchExplorer implements EventStreamTransformation { mGestureLibrary.load(); mSendHoverEnterDelayed = new SendHoverDelayed(MotionEvent.ACTION_HOVER_ENTER, true); mSendHoverExitDelayed = new SendHoverDelayed(MotionEvent.ACTION_HOVER_EXIT, false); - mSendInteractionEndEventsDelayed = new SendInteractionEndEventsDelayed(); + mSendTouchExplorationEndDelayed = new SendAccessibilityEventDelayed( + AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END, + mDetermineUserIntentTimeout); + mSendTouchInteractionEndDelayed = new SendAccessibilityEventDelayed( + AccessibilityEvent.TYPE_TOUCH_INTERACTION_END, + mDetermineUserIntentTimeout); mDoubleTapDetector = new DoubleTapDetector(); final float density = context.getResources().getDisplayMetrics().density; mScaledMinPointerDistanceToUseMiddleLocation = @@ -265,7 +266,7 @@ class TouchExplorer implements EventStreamTransformation { switch (mCurrentState) { case STATE_TOUCH_EXPLORING: { // If a touch exploration gesture is in progress send events for its end. - sendExitEventsIfNeeded(policyFlags); + sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags); } break; case STATE_DRAGGING: { mDraggingPointerId = INVALID_POINTER_ID; @@ -286,7 +287,8 @@ class TouchExplorer implements EventStreamTransformation { mSendHoverExitDelayed.remove(); mPerformLongPressDelayed.remove(); mExitGestureDetectionModeDelayed.remove(); - mSendInteractionEndEventsDelayed.remove(); + mSendTouchExplorationEndDelayed.remove(); + mSendTouchInteractionEndDelayed.remove(); // Reset the pointer trackers. mReceivedPointerTracker.clear(); mInjectedPointerTracker.clear(); @@ -301,6 +303,7 @@ class TouchExplorer implements EventStreamTransformation { if (mNext != null) { mNext.clear(); } + mTouchExplorationInProgress = false; } @Override @@ -341,19 +344,17 @@ class TouchExplorer implements EventStreamTransformation { // The event for gesture end should be strictly after the // last hover exit event. - if (mTouchExplorationGestureEnded + if (mSendTouchExplorationEndDelayed.isPending() && eventType == AccessibilityEvent.TYPE_VIEW_HOVER_EXIT) { - mSendInteractionEndEventsDelayed.remove(); - mTouchExplorationGestureEnded = false; + mSendTouchExplorationEndDelayed.remove(); sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END); } // The event for touch interaction end should be strictly after the // last hover exit and the touch exploration gesture end events. - if (mTouchInteractionEnded + if (mSendTouchInteractionEndDelayed.isPending() && eventType == AccessibilityEvent.TYPE_VIEW_HOVER_EXIT) { - mSendInteractionEndEventsDelayed.remove(); - mTouchInteractionEnded = false; + mSendTouchInteractionEndDelayed.remove(); sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); } @@ -396,15 +397,6 @@ class TouchExplorer implements EventStreamTransformation { switch (event.getActionMasked()) { case MotionEvent.ACTION_DOWN: - // The delayed enter not delivered implies that we have delivered - // TYPE_TOUCH_INTERACTION_START and not TYPE_TOUCH_INTERACTION_END, - // therefore we need to deliver the interaction end event here. - if (mSendHoverEnterDelayed.isPending()) { - sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); - } - // Announce the start of a new touch interaction. - sendAccessibilityEvent( - AccessibilityEvent.TYPE_TOUCH_INTERACTION_START); // Pre-feed the motion events to the gesture detector since we // have a distance slop before getting into gesture detection // mode and not using the points within this slop significantly @@ -426,8 +418,20 @@ class TouchExplorer implements EventStreamTransformation { mSendHoverExitDelayed.remove(); } - if (mSendInteractionEndEventsDelayed.isPending()) { - mSendInteractionEndEventsDelayed.forceSendAndRemove(); + if (mSendTouchExplorationEndDelayed.isPending()) { + mSendTouchExplorationEndDelayed.forceSendAndRemove(); + } + + if (mSendTouchInteractionEndDelayed.isPending()) { + mSendTouchInteractionEndDelayed.forceSendAndRemove(); + } + + // Every pointer that goes down is active until it moves or + // another one goes down. Hence, having more than one pointer + // down we have already send the interaction start event. + if (event.getPointerCount() == 1) { + sendAccessibilityEvent( + AccessibilityEvent.TYPE_TOUCH_INTERACTION_START); } mPerformLongPressDelayed.remove(); @@ -443,11 +447,13 @@ class TouchExplorer implements EventStreamTransformation { mPerformLongPressDelayed.post(event, policyFlags); break; } - // Deliver hover enter with a delay to have a chance - // to detect what the user is trying to do. - final int pointerId = receivedTracker.getPrimaryActivePointerId(); - final int pointerIdBits = (1 << pointerId); - mSendHoverEnterDelayed.post(event, true, pointerIdBits, policyFlags); + if (!mTouchExplorationInProgress) { + // Deliver hover enter with a delay to have a chance + // to detect what the user is trying to do. + final int pointerId = receivedTracker.getPrimaryActivePointerId(); + final int pointerIdBits = (1 << pointerId); + mSendHoverEnterDelayed.post(event, true, pointerIdBits, policyFlags); + } } break; default: { /* do nothing - let the code for ACTION_MOVE decide what to do */ @@ -512,12 +518,27 @@ class TouchExplorer implements EventStreamTransformation { break; } } else { + // Cancel the long press if pending and the user + // moved more than the slop. + if (mPerformLongPressDelayed.isPending()) { + 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 > mTouchSlop) { + mPerformLongPressDelayed.remove(); + } + } // The user is wither double tapping or performing long // press so do not send move events yet. if (mDoubleTapDetector.firstTapDetected()) { break; } - sendEnterEventsIfNeeded(policyFlags); + sendTouchExplorationGestureStartAndHoverEnterIfNeeded(policyFlags); sendMotionEvent(event, MotionEvent.ACTION_HOVER_MOVE, pointerIdBits, policyFlags); } @@ -548,7 +569,7 @@ class TouchExplorer implements EventStreamTransformation { } // We are sending events so send exit and gesture // end since we transition to another state. - sendExitEventsIfNeeded(policyFlags); + sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags); } // We know that a new state transition is to happen and the @@ -583,7 +604,7 @@ class TouchExplorer implements EventStreamTransformation { mPerformLongPressDelayed.remove(); // We are sending events so send exit and gesture // end since we transition to another state. - sendExitEventsIfNeeded(policyFlags); + sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags); } // More than two pointers are delegated to the view hierarchy. @@ -612,11 +633,14 @@ class TouchExplorer implements EventStreamTransformation { // If we have not delivered the enter schedule exit. if (mSendHoverEnterDelayed.isPending()) { - mSendHoverEnterDelayed.mTouchExplorationInProgress = false; mSendHoverExitDelayed.post(event, false, pointerIdBits, policyFlags); } else { // The user is touch exploring so we send events for end. - sendExitEventsIfNeeded(policyFlags); + sendHoverExitAndTouchExplorationGestureEndIfNeeded(policyFlags); + } + + if (!mSendTouchInteractionEndDelayed.isPending()) { + mSendTouchInteractionEndDelayed.post(); } } break; } @@ -645,7 +669,9 @@ class TouchExplorer implements EventStreamTransformation { // We are in dragging state so we have two pointers and another one // goes down => delegate the three pointers to the view hierarchy mCurrentState = STATE_DELEGATING; - sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags); + if (mDraggingPointerId != INVALID_POINTER_ID) { + sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags); + } sendDownForAllActiveNotInjectedPointers(event, policyFlags); } break; case MotionEvent.ACTION_MOVE: { @@ -702,10 +728,24 @@ class TouchExplorer implements EventStreamTransformation { } } } break; + case MotionEvent.ACTION_POINTER_UP: { + final int pointerId = event.getPointerId(event.getActionIndex()); + if (pointerId == mDraggingPointerId) { + mDraggingPointerId = INVALID_POINTER_ID; + // Send an event to the end of the drag gesture. + sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags); + } + } break; case MotionEvent.ACTION_UP: { // Announce the end of a new touch interaction. sendAccessibilityEvent( AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); + final int pointerId = event.getPointerId(event.getActionIndex()); + if (pointerId == mDraggingPointerId) { + mDraggingPointerId = INVALID_POINTER_ID; + // Send an event to the end of the drag gesture. + sendMotionEvent(event, MotionEvent.ACTION_UP, pointerIdBits, policyFlags); + } mCurrentState = STATE_TOUCH_EXPLORING; } break; case MotionEvent.ACTION_CANCEL: { @@ -830,6 +870,14 @@ class TouchExplorer implements EventStreamTransformation { if (accessibilityManager.isEnabled()) { AccessibilityEvent event = AccessibilityEvent.obtain(type); accessibilityManager.sendAccessibilityEvent(event); + switch (type) { + case AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START: { + mTouchExplorationInProgress = true; + } break; + case AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END: { + mTouchExplorationInProgress = false; + } break; + } } } @@ -877,14 +925,12 @@ class TouchExplorer implements EventStreamTransformation { * * @param policyFlags The policy flags associated with the event. */ - private void sendExitEventsIfNeeded(int policyFlags) { + private void sendHoverExitAndTouchExplorationGestureEndIfNeeded(int policyFlags) { MotionEvent event = mInjectedPointerTracker.getLastInjectedHoverEvent(); if (event != null && event.getActionMasked() != MotionEvent.ACTION_HOVER_EXIT) { final int pointerIdBits = event.getPointerIdBits(); - mTouchExplorationGestureEnded = true; - mTouchInteractionEnded = true; - if (!mSendInteractionEndEventsDelayed.isPending()) { - mSendInteractionEndEventsDelayed.post(); + if (!mSendTouchExplorationEndDelayed.isPending()) { + mSendTouchExplorationEndDelayed.post(); } sendMotionEvent(event, MotionEvent.ACTION_HOVER_EXIT, pointerIdBits, policyFlags); } @@ -896,10 +942,11 @@ class TouchExplorer implements EventStreamTransformation { * * @param policyFlags The policy flags associated with the event. */ - private void sendEnterEventsIfNeeded(int policyFlags) { + private void sendTouchExplorationGestureStartAndHoverEnterIfNeeded(int policyFlags) { MotionEvent event = mInjectedPointerTracker.getLastInjectedHoverEvent(); if (event != null && event.getActionMasked() == MotionEvent.ACTION_HOVER_EXIT) { final int pointerIdBits = event.getPointerIdBits(); + sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START); sendMotionEvent(event, MotionEvent.ACTION_HOVER_ENTER, pointerIdBits, policyFlags); } } @@ -1165,8 +1212,12 @@ class TouchExplorer implements EventStreamTransformation { mSendHoverExitDelayed.remove(); mPerformLongPressDelayed.remove(); - // The touch interaction has ended since we will send a click. - sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); + if (mSendTouchExplorationEndDelayed.isPending()) { + mSendTouchExplorationEndDelayed.forceSendAndRemove(); + } + if (mSendTouchInteractionEndDelayed.isPending()) { + mSendTouchInteractionEndDelayed.forceSendAndRemove(); + } int clickLocationX; int clickLocationY; @@ -1400,7 +1451,7 @@ class TouchExplorer implements EventStreamTransformation { mLongPressingPointerDeltaX = (int) mEvent.getX(pointerIndex) - clickLocationX; mLongPressingPointerDeltaY = (int) mEvent.getY(pointerIndex) - clickLocationY; - sendExitEventsIfNeeded(mPolicyFlags); + sendHoverExitAndTouchExplorationGestureEndIfNeeded(mPolicyFlags); mCurrentState = STATE_DELEGATING; sendDownForAllActiveNotInjectedPointers(mEvent, mPolicyFlags); @@ -1429,7 +1480,6 @@ class TouchExplorer implements EventStreamTransformation { private MotionEvent mPrototype; private int mPointerIdBits; private int mPolicyFlags; - private boolean mTouchExplorationInProgress; public SendHoverDelayed(int hoverAction, boolean gestureStarted) { mHoverAction = hoverAction; @@ -1440,7 +1490,6 @@ class TouchExplorer implements EventStreamTransformation { int pointerIdBits, int policyFlags) { remove(); mPrototype = MotionEvent.obtain(prototype); - mTouchExplorationInProgress = touchExplorationInProgress; mPointerIdBits = pointerIdBits; mPolicyFlags = policyFlags; mHandler.postDelayed(this, mDetermineUserIntentTimeout); @@ -1477,7 +1526,6 @@ class TouchExplorer implements EventStreamTransformation { mPrototype = null; mPointerIdBits = -1; mPolicyFlags = 0; - mTouchExplorationInProgress = false; } public void forceSendAndRemove() { @@ -1494,22 +1542,15 @@ class TouchExplorer implements EventStreamTransformation { Slog.d(LOG_TAG_SEND_HOVER_DELAYED, mGestureStarted ? "touchExplorationGestureStarted" : "touchExplorationGestureEnded"); } - if (mTouchExplorationInProgress) { - if (mGestureStarted) { - sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START); - } else { - mTouchExplorationGestureEnded = true; - mTouchInteractionEnded = true; - if (!mSendInteractionEndEventsDelayed.isPending()) { - mSendInteractionEndEventsDelayed.post(); - } - } + if (mGestureStarted) { + sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START); } else { - if (!mGestureStarted) { - mTouchInteractionEnded = true; - if (!mSendInteractionEndEventsDelayed.isPending()) { - mSendInteractionEndEventsDelayed.post(); - } + if (!mSendTouchExplorationEndDelayed.isPending()) { + mSendTouchExplorationEndDelayed.post(); + } + if (mSendTouchInteractionEndDelayed.isPending()) { + mSendTouchInteractionEndDelayed.remove(); + mSendTouchInteractionEndDelayed.post(); } } sendMotionEvent(mPrototype, mHoverAction, mPointerIdBits, mPolicyFlags); @@ -1517,14 +1558,21 @@ class TouchExplorer implements EventStreamTransformation { } } - private class SendInteractionEndEventsDelayed implements Runnable { + private class SendAccessibilityEventDelayed implements Runnable { + private final int mEventType; + private final int mDelay; + + public SendAccessibilityEventDelayed(int eventType, int delay) { + mEventType = eventType; + mDelay = delay; + } public void remove() { mHandler.removeCallbacks(this); } public void post() { - mHandler.postDelayed(this, SEND_INTERACTION_END_EVENTS_TIMEOUT); + mHandler.postDelayed(this, mDelay); } public boolean isPending() { @@ -1540,14 +1588,7 @@ class TouchExplorer implements EventStreamTransformation { @Override public void run() { - if (mTouchExplorationGestureEnded) { - mTouchExplorationGestureEnded = false; - sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END); - } - if (mTouchInteractionEnded) { - mTouchInteractionEnded = false; - sendAccessibilityEvent(AccessibilityEvent.TYPE_TOUCH_INTERACTION_END); - } + sendAccessibilityEvent(mEventType); } } diff --git a/services/java/com/android/server/display/DisplayDeviceInfo.java b/services/java/com/android/server/display/DisplayDeviceInfo.java index f0cd0f5176a2..b4dab8683693 100644 --- a/services/java/com/android/server/display/DisplayDeviceInfo.java +++ b/services/java/com/android/server/display/DisplayDeviceInfo.java @@ -38,9 +38,15 @@ final class DisplayDeviceInfo { public static final int FLAG_SUPPORTS_ROTATION = 1 << 1; /** - * Flag: Indicates that this display device can show secure surfaces. + * Flag: Indicates that this display device has secure video output, such as HDCP. */ - public static final int FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT = 1 << 2; + public static final int FLAG_SECURE = 1 << 2; + + /** + * Flag: Indicates that this display device supports compositing + * from gralloc protected buffers. + */ + public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1 << 3; /** * Touch attachment: Display does not receive touch. @@ -182,8 +188,11 @@ final class DisplayDeviceInfo { if ((flags & FLAG_SUPPORTS_ROTATION) != 0) { msg.append(", FLAG_SUPPORTS_ROTATION"); } - if ((flags & FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT) != 0) { - msg.append(", FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT"); + if ((flags & FLAG_SECURE) != 0) { + msg.append(", FLAG_SECURE"); + } + if ((flags & FLAG_SUPPORTS_PROTECTED_BUFFERS) != 0) { + msg.append(", FLAG_SUPPORTS_PROTECTED_BUFFERS"); } return msg.toString(); } diff --git a/services/java/com/android/server/display/HeadlessDisplayAdapter.java b/services/java/com/android/server/display/HeadlessDisplayAdapter.java index f3bec1d56213..7ec537f7db10 100644 --- a/services/java/com/android/server/display/HeadlessDisplayAdapter.java +++ b/services/java/com/android/server/display/HeadlessDisplayAdapter.java @@ -60,7 +60,8 @@ final class HeadlessDisplayAdapter extends DisplayAdapter { mInfo.xDpi = 160; mInfo.yDpi = 160; mInfo.flags = DisplayDeviceInfo.FLAG_DEFAULT_DISPLAY - | DisplayDeviceInfo.FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT; + | DisplayDeviceInfo.FLAG_SECURE + | DisplayDeviceInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS; mInfo.touch = DisplayDeviceInfo.TOUCH_NONE; } return mInfo; diff --git a/services/java/com/android/server/display/LocalDisplayAdapter.java b/services/java/com/android/server/display/LocalDisplayAdapter.java index 9c5146382974..679a67e4dcb3 100644 --- a/services/java/com/android/server/display/LocalDisplayAdapter.java +++ b/services/java/com/android/server/display/LocalDisplayAdapter.java @@ -124,11 +124,16 @@ final class LocalDisplayAdapter extends DisplayAdapter { mInfo.width = mPhys.width; mInfo.height = mPhys.height; mInfo.refreshRate = mPhys.refreshRate; + + // Assume that all built-in displays have secure output (eg. HDCP) and + // support compositing from gralloc protected buffers. + mInfo.flags = DisplayDeviceInfo.FLAG_SECURE + | DisplayDeviceInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS; + if (mBuiltInDisplayId == Surface.BUILT_IN_DISPLAY_ID_MAIN) { mInfo.name = getContext().getResources().getString( com.android.internal.R.string.display_manager_built_in_display_name); - mInfo.flags = DisplayDeviceInfo.FLAG_DEFAULT_DISPLAY - | DisplayDeviceInfo.FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT + mInfo.flags |= DisplayDeviceInfo.FLAG_DEFAULT_DISPLAY | DisplayDeviceInfo.FLAG_SUPPORTS_ROTATION; mInfo.densityDpi = (int)(mPhys.density * 160 + 0.5f); mInfo.xDpi = mPhys.xDpi; @@ -137,7 +142,6 @@ final class LocalDisplayAdapter extends DisplayAdapter { } else { mInfo.name = getContext().getResources().getString( com.android.internal.R.string.display_manager_hdmi_display_name); - mInfo.flags = DisplayDeviceInfo.FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT; mInfo.touch = DisplayDeviceInfo.TOUCH_EXTERNAL; mInfo.setAssumedDensityForExternalDisplay(mPhys.width, mPhys.height); } diff --git a/services/java/com/android/server/display/LogicalDisplay.java b/services/java/com/android/server/display/LogicalDisplay.java index 3607de15dd50..c4b749c3e90b 100644 --- a/services/java/com/android/server/display/LogicalDisplay.java +++ b/services/java/com/android/server/display/LogicalDisplay.java @@ -179,8 +179,8 @@ final class LogicalDisplay { if (!Objects.equal(mPrimaryDisplayDeviceInfo, deviceInfo)) { mBaseDisplayInfo.layerStack = mLayerStack; mBaseDisplayInfo.flags = 0; - if ((deviceInfo.flags & DisplayDeviceInfo.FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT) != 0) { - mBaseDisplayInfo.flags |= Display.FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT; + if ((deviceInfo.flags & DisplayDeviceInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS) != 0) { + mBaseDisplayInfo.flags |= Display.FLAG_SUPPORTS_PROTECTED_BUFFERS; } mBaseDisplayInfo.name = deviceInfo.name; mBaseDisplayInfo.appWidth = deviceInfo.width; @@ -299,7 +299,9 @@ final class LogicalDisplay { } public void dumpLocked(PrintWriter pw) { + pw.println("mDisplayId=" + mDisplayId); pw.println("mLayerStack=" + mLayerStack); + pw.println("mHasContent=" + mHasContent); pw.println("mPrimaryDisplayDevice=" + (mPrimaryDisplayDevice != null ? mPrimaryDisplayDevice.getNameLocked() : "null")); pw.println("mBaseDisplayInfo=" + mBaseDisplayInfo); diff --git a/services/java/com/android/server/display/OverlayDisplayAdapter.java b/services/java/com/android/server/display/OverlayDisplayAdapter.java index 0767fc05d700..dfacf2a53322 100644 --- a/services/java/com/android/server/display/OverlayDisplayAdapter.java +++ b/services/java/com/android/server/display/OverlayDisplayAdapter.java @@ -19,14 +19,11 @@ package com.android.server.display; import com.android.internal.util.DumpUtils; import com.android.internal.util.IndentingPrintWriter; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; import android.database.ContentObserver; +import android.graphics.SurfaceTexture; import android.os.Handler; import android.os.IBinder; -import android.os.UserHandle; import android.provider.Settings; import android.util.DisplayMetrics; import android.util.Slog; @@ -192,28 +189,42 @@ final class OverlayDisplayAdapter extends DisplayAdapter { private final int mDensityDpi; private Surface mSurface; + private SurfaceTexture mSurfaceTexture; private DisplayDeviceInfo mInfo; public OverlayDisplayDevice(IBinder displayToken, String name, int width, int height, float refreshRate, int densityDpi, - Surface surface) { + SurfaceTexture surfaceTexture) { super(OverlayDisplayAdapter.this, displayToken); mName = name; mWidth = width; mHeight = height; mRefreshRate = refreshRate; mDensityDpi = densityDpi; - mSurface = surface; + mSurfaceTexture = surfaceTexture; } - public void clearSurfaceLocked() { - mSurface = null; + public void clearSurfaceTextureLocked() { + if (mSurfaceTexture != null) { + mSurfaceTexture = null; + } sendTraversalRequestLocked(); } @Override public void performTraversalInTransactionLocked() { - setSurfaceInTransactionLocked(mSurface); + if (mSurfaceTexture != null) { + if (mSurface == null) { + mSurface = new Surface(mSurfaceTexture); + } + setSurfaceInTransactionLocked(mSurface); + } else { + setSurfaceInTransactionLocked(null); + if (mSurface != null) { + mSurface.destroy(); + mSurface = null; + } + } } @Override @@ -227,7 +238,7 @@ final class OverlayDisplayAdapter extends DisplayAdapter { mInfo.densityDpi = mDensityDpi; mInfo.xDpi = mDensityDpi; mInfo.yDpi = mDensityDpi; - mInfo.flags = DisplayDeviceInfo.FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT; + mInfo.flags = 0; mInfo.touch = DisplayDeviceInfo.TOUCH_NONE; } return mInfo; @@ -268,11 +279,11 @@ final class OverlayDisplayAdapter extends DisplayAdapter { // Called on the UI thread. @Override - public void onWindowCreated(Surface surface, float refreshRate) { + public void onWindowCreated(SurfaceTexture surfaceTexture, float refreshRate) { synchronized (getSyncRoot()) { IBinder displayToken = Surface.createDisplay(mName); mDevice = new OverlayDisplayDevice(displayToken, mName, - mWidth, mHeight, refreshRate, mDensityDpi, surface); + mWidth, mHeight, refreshRate, mDensityDpi, surfaceTexture); sendDisplayDeviceEventLocked(mDevice, DISPLAY_DEVICE_EVENT_ADDED); } @@ -283,7 +294,7 @@ final class OverlayDisplayAdapter extends DisplayAdapter { public void onWindowDestroyed() { synchronized (getSyncRoot()) { if (mDevice != null) { - mDevice.clearSurfaceLocked(); + mDevice.clearSurfaceTextureLocked(); sendDisplayDeviceEventLocked(mDevice, DISPLAY_DEVICE_EVENT_REMOVED); } } diff --git a/services/java/com/android/server/display/OverlayDisplayWindow.java b/services/java/com/android/server/display/OverlayDisplayWindow.java index d08f65fe5e2e..a0edced4b853 100644 --- a/services/java/com/android/server/display/OverlayDisplayWindow.java +++ b/services/java/com/android/server/display/OverlayDisplayWindow.java @@ -29,7 +29,6 @@ import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.ScaleGestureDetector; -import android.view.Surface; import android.view.TextureView; import android.view.View; import android.view.WindowManager; @@ -146,6 +145,7 @@ final class OverlayDisplayWindow implements DumpUtils.Dump { } } + @Override public void dump(PrintWriter pw) { pw.println("mWindowVisible=" + mWindowVisible); pw.println("mWindowX=" + mWindowX); @@ -291,8 +291,7 @@ final class OverlayDisplayWindow implements DumpUtils.Dump { @Override public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int width, int height) { - mListener.onWindowCreated(new Surface(surfaceTexture), - mDefaultDisplayInfo.refreshRate); + mListener.onWindowCreated(surfaceTexture, mDefaultDisplayInfo.refreshRate); } @Override @@ -361,7 +360,7 @@ final class OverlayDisplayWindow implements DumpUtils.Dump { * Watches for significant changes in the overlay display window lifecycle. */ public interface Listener { - public void onWindowCreated(Surface surface, float refreshRate); + public void onWindowCreated(SurfaceTexture surfaceTexture, float refreshRate); public void onWindowDestroyed(); } }
\ No newline at end of file diff --git a/services/java/com/android/server/display/WifiDisplayAdapter.java b/services/java/com/android/server/display/WifiDisplayAdapter.java index 4a89be7d5d54..b2beb5e5bbb2 100644 --- a/services/java/com/android/server/display/WifiDisplayAdapter.java +++ b/services/java/com/android/server/display/WifiDisplayAdapter.java @@ -50,7 +50,8 @@ import java.util.Arrays; final class WifiDisplayAdapter extends DisplayAdapter { private static final String TAG = "WifiDisplayAdapter"; - private PersistentDataStore mPersistentDataStore; + private final PersistentDataStore mPersistentDataStore; + private final boolean mSupportsProtectedBuffers; private WifiDisplayController mDisplayController; private WifiDisplayDevice mDisplayDevice; @@ -70,6 +71,8 @@ final class WifiDisplayAdapter extends DisplayAdapter { PersistentDataStore persistentDataStore) { super(syncRoot, context, handler, listener, TAG); mPersistentDataStore = persistentDataStore; + mSupportsProtectedBuffers = context.getResources().getBoolean( + com.android.internal.R.bool.config_wifiDisplaySupportsProtectedBuffers); } @Override @@ -84,6 +87,7 @@ final class WifiDisplayAdapter extends DisplayAdapter { pw.println("mAvailableDisplays=" + Arrays.toString(mAvailableDisplays)); pw.println("mRememberedDisplays=" + Arrays.toString(mRememberedDisplays)); pw.println("mPendingStatusChangeBroadcast=" + mPendingStatusChangeBroadcast); + pw.println("mSupportsProtectedBuffers=" + mSupportsProtectedBuffers); // Try to dump the controller state. if (mDisplayController == null) { @@ -217,7 +221,10 @@ final class WifiDisplayAdapter extends DisplayAdapter { int deviceFlags = 0; if ((flags & RemoteDisplay.DISPLAY_FLAG_SECURE) != 0) { - deviceFlags |= DisplayDeviceInfo.FLAG_SUPPORTS_SECURE_VIDEO_OUTPUT; + deviceFlags |= DisplayDeviceInfo.FLAG_SECURE; + } + if (mSupportsProtectedBuffers) { + deviceFlags |= DisplayDeviceInfo.FLAG_SUPPORTS_PROTECTED_BUFFERS; } float refreshRate = 60.0f; // TODO: get this for real diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 564a805ea4ff..0f3dc9257300 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -851,7 +851,8 @@ public class PackageManagerService extends IPackageManager.Stub { state.setVerifierResponse(Binder.getCallingUid(), PackageManager.VERIFICATION_ALLOW_WITHOUT_SUFFICIENT); broadcastPackageVerified(verificationId, args.packageURI, - PackageManager.VERIFICATION_ALLOW); + PackageManager.VERIFICATION_ALLOW, + state.getInstallArgs().getUser()); try { ret = args.copyApk(mContainerService, true); } catch (RemoteException e) { @@ -859,7 +860,8 @@ public class PackageManagerService extends IPackageManager.Stub { } } else { broadcastPackageVerified(verificationId, args.packageURI, - PackageManager.VERIFICATION_REJECT); + PackageManager.VERIFICATION_REJECT, + state.getInstallArgs().getUser()); } processPendingInstall(args, ret); @@ -889,7 +891,7 @@ public class PackageManagerService extends IPackageManager.Stub { if (state.isInstallAllowed()) { ret = PackageManager.INSTALL_FAILED_INTERNAL_ERROR; broadcastPackageVerified(verificationId, args.packageURI, - response.code); + response.code, state.getInstallArgs().getUser()); try { ret = args.copyApk(mContainerService, true); } catch (RemoteException e) { @@ -5741,14 +5743,15 @@ public class PackageManagerService extends IPackageManager.Stub { } private void broadcastPackageVerified(int verificationId, Uri packageUri, - int verificationCode) { + int verificationCode, UserHandle user) { final Intent intent = new Intent(Intent.ACTION_PACKAGE_VERIFIED); intent.setDataAndType(packageUri, PACKAGE_MIME_TYPE); intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); intent.putExtra(PackageManager.EXTRA_VERIFICATION_ID, verificationId); intent.putExtra(PackageManager.EXTRA_VERIFICATION_RESULT, verificationCode); - mContext.sendBroadcast(intent, android.Manifest.permission.PACKAGE_VERIFICATION_AGENT); + mContext.sendBroadcastAsUser(intent, user, + android.Manifest.permission.PACKAGE_VERIFICATION_AGENT); } private ComponentName matchComponentForVerifier(String packageName, @@ -6398,7 +6401,7 @@ public class PackageManagerService extends IPackageManager.Stub { * do, then we'll defer to them to verify the packages. */ final int requiredUid = mRequiredVerifierPackage == null ? -1 - : getPackageUid(mRequiredVerifierPackage, 0); + : getPackageUid(mRequiredVerifierPackage, getUser().getIdentifier()); if (requiredUid != -1 && isVerificationEnabled(flags)) { final Intent verification = new Intent( Intent.ACTION_PACKAGE_NEEDS_VERIFICATION); @@ -6477,7 +6480,7 @@ public class PackageManagerService extends IPackageManager.Stub { final Intent sufficientIntent = new Intent(verification); sufficientIntent.setComponent(verifierComponent); - mContext.sendBroadcast(sufficientIntent); + mContext.sendBroadcastAsUser(sufficientIntent, getUser()); } } } @@ -6492,7 +6495,7 @@ public class PackageManagerService extends IPackageManager.Stub { * target BroadcastReceivers have run. */ verification.setComponent(requiredVerifierComponent); - mContext.sendOrderedBroadcast(verification, + mContext.sendOrderedBroadcastAsUser(verification, getUser(), android.Manifest.permission.PACKAGE_VERIFICATION_AGENT, new BroadcastReceiver() { @Override @@ -6779,6 +6782,10 @@ public class PackageManagerService extends IPackageManager.Stub { protected boolean isFwdLocked() { return (flags & PackageManager.INSTALL_FORWARD_LOCK) != 0; } + + UserHandle getUser() { + return user; + } } class FileInstallArgs extends InstallArgs { diff --git a/services/java/com/android/server/pm/PackageSettingBase.java b/services/java/com/android/server/pm/PackageSettingBase.java index 6a363a8c9055..ae1b2134907e 100644 --- a/services/java/com/android/server/pm/PackageSettingBase.java +++ b/services/java/com/android/server/pm/PackageSettingBase.java @@ -65,8 +65,7 @@ class PackageSettingBase extends GrantedPermissions { boolean permissionsFixed; boolean haveGids; - private static final PackageUserState DEFAULT_USER_STATE = new PackageUserState(false); - private static final PackageUserState DEFAULT_SYSTEM_USER_STATE = new PackageUserState(true); + private static final PackageUserState DEFAULT_USER_STATE = new PackageUserState(); // Whether this package is currently stopped, thus can not be // started until explicitly launched by the user. @@ -176,7 +175,7 @@ class PackageSettingBase extends GrantedPermissions { private PackageUserState modifyUserState(int userId) { PackageUserState state = userState.get(userId); if (state == null) { - state = new PackageUserState((pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0); + state = new PackageUserState(); userState.put(userId, state); } return state; @@ -187,8 +186,7 @@ class PackageSettingBase extends GrantedPermissions { if (state != null) { return state; } - return ((pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0) - ? DEFAULT_SYSTEM_USER_STATE : DEFAULT_USER_STATE; + return DEFAULT_USER_STATE; } void setEnabled(int state, int userId) { diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index 664125ad95d6..9a01022873f1 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -130,11 +130,22 @@ public final class PowerManagerService extends IPowerManager.Stub private static final int DEFAULT_SCREEN_OFF_TIMEOUT = 15 * 1000; private static final int MINIMUM_SCREEN_OFF_TIMEOUT = 10 * 1000; - // The screen dim duration, in seconds. + // The screen dim duration, in milliseconds. // This is subtracted from the end of the screen off timeout so the // minimum screen off timeout should be longer than this. private static final int SCREEN_DIM_DURATION = 7 * 1000; + // The maximum screen dim time expressed as a ratio relative to the screen + // off timeout. If the screen off timeout is very short then we want the + // dim timeout to also be quite short so that most of the time is spent on. + // Otherwise the user won't get much screen on time before dimming occurs. + private static final float MAXIMUM_SCREEN_DIM_RATIO = 0.2f; + + // Upper bound on the battery charge percentage in order to consider turning + // the screen on when the device starts charging wirelessly. + // See point of use for more details. + private static final int WIRELESS_CHARGER_TURN_ON_BATTERY_LEVEL_LIMIT = 95; + private Context mContext; private LightsService mLightsService; private BatteryService mBatteryService; @@ -218,6 +229,9 @@ public final class PowerManagerService extends IPowerManager.Stub // True if the device is plugged into a power source. private boolean mIsPowered; + // The current plug type, such as BatteryManager.BATTERY_PLUGGED_WIRELESS. + private int mPlugType; + // True if the device should wake up when plugged or unplugged. private boolean mWakeUpWhenPluggedOrUnpluggedConfig; @@ -1013,10 +1027,19 @@ public final class PowerManagerService extends IPowerManager.Stub */ private void updateIsPoweredLocked(int dirty) { if ((dirty & DIRTY_BATTERY_STATE) != 0) { - boolean wasPowered = mIsPowered; - mIsPowered = mBatteryService.isPowered(); + final boolean wasPowered = mIsPowered; + final int oldPlugType = mPlugType; + mIsPowered = mBatteryService.isPowered(BatteryManager.BATTERY_PLUGGED_ANY); + mPlugType = mBatteryService.getPlugType(); + + if (DEBUG) { + Slog.d(TAG, "updateIsPoweredLocked: wasPowered=" + wasPowered + + ", mIsPowered=" + mIsPowered + + ", oldPlugType=" + oldPlugType + + ", mPlugType=" + mPlugType); + } - if (wasPowered != mIsPowered) { + if (wasPowered != mIsPowered || oldPlugType != mPlugType) { mDirty |= DIRTY_IS_POWERED; // Treat plugging and unplugging the devices as a user activity. @@ -1025,7 +1048,7 @@ public final class PowerManagerService extends IPowerManager.Stub // Some devices also wake the device when plugged or unplugged because // they don't have a charging LED. final long now = SystemClock.uptimeMillis(); - if (mWakeUpWhenPluggedOrUnpluggedConfig) { + if (shouldWakeUpWhenPluggedOrUnpluggedLocked(wasPowered, oldPlugType)) { wakeUpNoUpdateLocked(now); } userActivityNoUpdateLocked( @@ -1034,6 +1057,44 @@ public final class PowerManagerService extends IPowerManager.Stub } } + private boolean shouldWakeUpWhenPluggedOrUnpluggedLocked(boolean wasPowered, int oldPlugType) { + if (mWakeUpWhenPluggedOrUnpluggedConfig) { + // FIXME: Need more accurate detection of wireless chargers. + // + // We are unable to accurately detect whether the device is resting on the + // charger unless it is actually receiving power. This causes us some grief + // because the device might not appear to be plugged into the wireless charger + // unless it actually charging. + // + // To avoid spuriously waking the screen, we apply a special policy to + // wireless chargers. + // + // 1. Don't wake the device when unplugged from wireless charger because + // it might be that the device is still resting on the wireless charger + // but is not receiving power anymore because the battery is full. + // + // 2. Don't wake the device when plugged into a wireless charger if the + // battery already appears to be mostly full. This situation may indicate + // that the device was resting on the charger the whole time and simply + // wasn't receiving power because the battery was full. We can't tell + // whether the device was just placed on the charger or whether it has + // been there for half of the night slowly discharging until it hit + // the point where it needed to start charging again. + if (wasPowered && !mIsPowered + && oldPlugType == BatteryManager.BATTERY_PLUGGED_WIRELESS) { + return false; + } + if (!wasPowered && mIsPowered + && mPlugType == BatteryManager.BATTERY_PLUGGED_WIRELESS + && mBatteryService.getBatteryLevel() >= + WIRELESS_CHARGER_TURN_ON_BATTERY_LEVEL_LIMIT) { + return false; + } + return true; + } + return false; + } + /** * Updates the value of mStayOn. * Sets DIRTY_STAY_ON if a change occurred. @@ -1113,7 +1174,7 @@ public final class PowerManagerService extends IPowerManager.Stub long nextTimeout = 0; if (mWakefulness != WAKEFULNESS_ASLEEP) { final int screenOffTimeout = getScreenOffTimeoutLocked(); - final int screenDimDuration = getScreenDimDurationLocked(); + final int screenDimDuration = getScreenDimDurationLocked(screenOffTimeout); mUserActivitySummary = 0; if (mLastUserActivityTime >= mLastWakeTime) { @@ -1187,8 +1248,9 @@ public final class PowerManagerService extends IPowerManager.Stub return Math.max(timeout, MINIMUM_SCREEN_OFF_TIMEOUT); } - private int getScreenDimDurationLocked() { - return SCREEN_DIM_DURATION; + private int getScreenDimDurationLocked(int screenOffTimeout) { + return Math.min(SCREEN_DIM_DURATION, + (int)(screenOffTimeout * MAXIMUM_SCREEN_DIM_RATIO)); } /** @@ -1220,15 +1282,25 @@ public final class PowerManagerService extends IPowerManager.Stub return changed; } - // Also used when exiting a dream to determine whether we should go back - // to being fully awake or else go to sleep for good. + /** + * Returns true if the device should go to sleep now. + * Also used when exiting a dream to determine whether we should go back + * to being fully awake or else go to sleep for good. + */ private boolean isItBedTimeYetLocked() { - return mBootCompleted && !mStayOn - && (mWakeLockSummary - & (WAKE_LOCK_SCREEN_BRIGHT | WAKE_LOCK_SCREEN_DIM - | WAKE_LOCK_PROXIMITY_SCREEN_OFF)) == 0 - && (mUserActivitySummary - & (USER_ACTIVITY_SCREEN_BRIGHT | USER_ACTIVITY_SCREEN_DIM)) == 0; + return mBootCompleted && !isScreenBeingKeptOnLocked(); + } + + /** + * Returns true if the screen is being kept on by a wake lock, user activity + * or the stay on while powered setting. + */ + private boolean isScreenBeingKeptOnLocked() { + return mStayOn + || (mWakeLockSummary & (WAKE_LOCK_SCREEN_BRIGHT | WAKE_LOCK_SCREEN_DIM + | WAKE_LOCK_PROXIMITY_SCREEN_OFF)) != 0 + || (mUserActivitySummary & (USER_ACTIVITY_SCREEN_BRIGHT + | USER_ACTIVITY_SCREEN_DIM)) != 0; } /** @@ -1236,6 +1308,9 @@ public final class PowerManagerService extends IPowerManager.Stub */ private void updateDreamLocked(int dirty) { if ((dirty & (DIRTY_WAKEFULNESS + | DIRTY_USER_ACTIVITY + | DIRTY_WAKE_LOCKS + | DIRTY_BOOT_COMPLETED | DIRTY_SETTINGS | DIRTY_IS_POWERED | DIRTY_STAY_ON @@ -1318,15 +1393,15 @@ public final class PowerManagerService extends IPowerManager.Stub } /** - * Returns true if the device is allowed to dream in its current state, - * assuming that there was either an explicit request to nap or the user activity - * timeout expired and no wake locks are held. + * Returns true if the device is allowed to dream in its current state + * assuming that it is currently napping or dreaming. */ private boolean canDreamLocked() { - return mIsPowered - && mDreamsSupportedConfig + return mDreamsSupportedConfig && mDreamsEnabledSetting - && mDisplayPowerRequest.screenState != DisplayPowerRequest.SCREEN_STATE_OFF; + && mDisplayPowerRequest.screenState != DisplayPowerRequest.SCREEN_STATE_OFF + && mBootCompleted + && (mIsPowered || isScreenBeingKeptOnLocked()); } /** @@ -1527,22 +1602,39 @@ public final class PowerManagerService extends IPowerManager.Stub } /** - * Reboot the device immediately, passing 'reason' (may be null) + * Reboot the device, passing 'reason' (may be null) + * to the underlying __reboot system call. Should not return. + */ + @Override // Binder call + public void reboot(boolean confirm, String reason, boolean wait) { + mContext.enforceCallingOrSelfPermission(android.Manifest.permission.REBOOT, null); + + final long ident = Binder.clearCallingIdentity(); + try { + rebootInternal(false, confirm, reason, wait); + } finally { + Binder.restoreCallingIdentity(ident); + } + } + + /** + * Shutdown the devic, passing 'reason' (may be null) * to the underlying __reboot system call. Should not return. */ @Override // Binder call - public void reboot(String reason) { + public void shutdown(boolean confirm, boolean wait) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.REBOOT, null); final long ident = Binder.clearCallingIdentity(); try { - rebootInternal(reason); + rebootInternal(true, confirm, null, wait); } finally { Binder.restoreCallingIdentity(ident); } } - private void rebootInternal(final String reason) { + private void rebootInternal(final boolean shutdown, final boolean confirm, + final String reason, boolean wait) { if (mHandler == null || !mSystemReady) { throw new IllegalStateException("Too early to call reboot()"); } @@ -1550,7 +1642,11 @@ public final class PowerManagerService extends IPowerManager.Stub Runnable runnable = new Runnable() { public void run() { synchronized (this) { - ShutdownThread.reboot(mContext, reason, false); + if (shutdown) { + ShutdownThread.shutdown(mContext, confirm); + } else { + ShutdownThread.reboot(mContext, reason, confirm); + } } } }; @@ -1561,11 +1657,13 @@ public final class PowerManagerService extends IPowerManager.Stub mHandler.sendMessage(msg); // PowerManager.reboot() is documented not to return so just wait for the inevitable. - synchronized (runnable) { - while (true) { - try { - runnable.wait(); - } catch (InterruptedException e) { + if (wait) { + synchronized (runnable) { + while (true) { + try { + runnable.wait(); + } catch (InterruptedException e) { + } } } } @@ -1886,6 +1984,7 @@ public final class PowerManagerService extends IPowerManager.Stub pw.println(" mDirty=0x" + Integer.toHexString(mDirty)); pw.println(" mWakefulness=" + wakefulnessToString(mWakefulness)); pw.println(" mIsPowered=" + mIsPowered); + pw.println(" mPlugType=" + mPlugType); pw.println(" mStayOn=" + mStayOn); pw.println(" mBootCompleted=" + mBootCompleted); pw.println(" mSystemReady=" + mSystemReady); @@ -1931,6 +2030,12 @@ public final class PowerManagerService extends IPowerManager.Stub pw.println(" mScreenBrightnessSettingMaximum=" + mScreenBrightnessSettingMaximum); pw.println(" mScreenBrightnessSettingDefault=" + mScreenBrightnessSettingDefault); + final int screenOffTimeout = getScreenOffTimeoutLocked(); + final int screenDimDuration = getScreenDimDurationLocked(screenOffTimeout); + pw.println(); + pw.println("Screen off timeout: " + screenOffTimeout + " ms"); + pw.println("Screen dim duration: " + screenDimDuration + " ms"); + pw.println(); pw.println("Wake Locks: size=" + mWakeLocks.size()); for (WakeLock wl : mWakeLocks) { diff --git a/services/java/com/android/server/usb/UsbDeviceManager.java b/services/java/com/android/server/usb/UsbDeviceManager.java index 10011aadf6cb..95797ef2301e 100644 --- a/services/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/java/com/android/server/usb/UsbDeviceManager.java @@ -16,9 +16,9 @@ package com.android.server.usb; -import android.app.PendingIntent; import android.app.Notification; import android.app.NotificationManager; +import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.ContentResolver; @@ -30,23 +30,19 @@ import android.content.res.Resources; import android.database.ContentObserver; import android.hardware.usb.UsbAccessory; import android.hardware.usb.UsbManager; -import android.net.Uri; -import android.os.Binder; -import android.os.Bundle; import android.os.FileUtils; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; import android.os.Message; -import android.os.Parcelable; import android.os.ParcelFileDescriptor; import android.os.Process; -import android.os.UserHandle; -import android.os.storage.StorageManager; -import android.os.storage.StorageVolume; import android.os.SystemClock; import android.os.SystemProperties; import android.os.UEventObserver; +import android.os.UserHandle; +import android.os.storage.StorageManager; +import android.os.storage.StorageVolume; import android.provider.Settings; import android.util.Pair; import android.util.Slog; @@ -56,10 +52,9 @@ import java.io.FileDescriptor; import java.io.FileNotFoundException; import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; -import java.util.HashMap; import java.util.Map; import java.util.Scanner; @@ -106,9 +101,12 @@ public class UsbDeviceManager { private UsbHandler mHandler; private boolean mBootCompleted; + private final Object mLock = new Object(); + private final Context mContext; private final ContentResolver mContentResolver; - private final UsbSettingsManager mSettingsManager; + // @GuardedBy("mLock") + private UsbSettingsManager mCurrentSettings; private NotificationManager mNotificationManager; private final boolean mHasUsbAccessory; private boolean mUseUsbNotification; @@ -149,10 +147,9 @@ public class UsbDeviceManager { } }; - public UsbDeviceManager(Context context, UsbSettingsManager settingsManager) { + public UsbDeviceManager(Context context) { mContext = context; mContentResolver = context.getContentResolver(); - mSettingsManager = settingsManager; PackageManager pm = mContext.getPackageManager(); mHasUsbAccessory = pm.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY); initRndisAddress(); @@ -175,6 +172,18 @@ public class UsbDeviceManager { } } + public void setCurrentSettings(UsbSettingsManager settings) { + synchronized (mLock) { + mCurrentSettings = settings; + } + } + + private UsbSettingsManager getCurrentSettings() { + synchronized (mLock) { + return mCurrentSettings; + } + } + public void systemReady() { if (DEBUG) Slog.d(TAG, "systemReady"); @@ -516,7 +525,7 @@ public class UsbDeviceManager { Slog.d(TAG, "entering USB accessory mode: " + mCurrentAccessory); // defer accessoryAttached if system is not ready if (mBootCompleted) { - mSettingsManager.accessoryAttached(mCurrentAccessory); + getCurrentSettings().accessoryAttached(mCurrentAccessory); } // else handle in mBootCompletedReceiver } else { Slog.e(TAG, "nativeGetAccessoryStrings failed"); @@ -529,7 +538,7 @@ public class UsbDeviceManager { if (mCurrentAccessory != null) { if (mBootCompleted) { - mSettingsManager.accessoryDetached(mCurrentAccessory); + getCurrentSettings().accessoryDetached(mCurrentAccessory); } mCurrentAccessory = null; mAccessoryStrings = null; @@ -618,7 +627,7 @@ public class UsbDeviceManager { case MSG_BOOT_COMPLETED: mBootCompleted = true; if (mCurrentAccessory != null) { - mSettingsManager.accessoryAttached(mCurrentAccessory); + getCurrentSettings().accessoryAttached(mCurrentAccessory); } if (mDebuggingManager != null) { mDebuggingManager.setAdbEnabled(mAdbEnabled); @@ -774,7 +783,7 @@ public class UsbDeviceManager { + currentAccessory; throw new IllegalArgumentException(error); } - mSettingsManager.checkPermission(accessory); + getCurrentSettings().checkPermission(accessory); return nativeOpenAccessory(); } diff --git a/services/java/com/android/server/usb/UsbHostManager.java b/services/java/com/android/server/usb/UsbHostManager.java index 0a0ff598d7d8..175ae6f0677a 100644 --- a/services/java/com/android/server/usb/UsbHostManager.java +++ b/services/java/com/android/server/usb/UsbHostManager.java @@ -16,35 +16,19 @@ package com.android.server.usb; -import android.app.PendingIntent; -import android.content.BroadcastReceiver; -import android.content.ContentResolver; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.hardware.usb.IUsbManager; import android.hardware.usb.UsbConstants; import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbEndpoint; import android.hardware.usb.UsbInterface; -import android.hardware.usb.UsbManager; -import android.net.Uri; -import android.os.Binder; import android.os.Bundle; -import android.os.Handler; -import android.os.Message; -import android.os.Parcelable; import android.os.ParcelFileDescriptor; -import android.os.UEventObserver; -import android.provider.Settings; +import android.os.Parcelable; import android.util.Slog; -import java.io.File; import java.io.FileDescriptor; -import java.io.FileReader; import java.io.PrintWriter; import java.util.HashMap; -import java.util.List; /** * UsbHostManager manages USB state in host mode. @@ -54,22 +38,35 @@ public class UsbHostManager { private static final boolean LOG = false; // contains all connected USB devices - private final HashMap<String,UsbDevice> mDevices = new HashMap<String,UsbDevice>(); + private final HashMap<String, UsbDevice> mDevices = new HashMap<String, UsbDevice>(); // USB busses to exclude from USB host support private final String[] mHostBlacklist; private final Context mContext; private final Object mLock = new Object(); - private final UsbSettingsManager mSettingsManager; - public UsbHostManager(Context context, UsbSettingsManager settingsManager) { + // @GuardedBy("mLock") + private UsbSettingsManager mCurrentSettings; + + public UsbHostManager(Context context) { mContext = context; - mSettingsManager = settingsManager; mHostBlacklist = context.getResources().getStringArray( com.android.internal.R.array.config_usbHostBlacklist); } + public void setCurrentSettings(UsbSettingsManager settings) { + synchronized (mLock) { + mCurrentSettings = settings; + } + } + + private UsbSettingsManager getCurrentSettings() { + synchronized (mLock) { + return mCurrentSettings; + } + } + private boolean isBlackListed(String deviceName) { int count = mHostBlacklist.length; for (int i = 0; i < count; i++) { @@ -154,7 +151,7 @@ public class UsbHostManager { UsbDevice device = new UsbDevice(deviceName, vendorID, productID, deviceClass, deviceSubclass, deviceProtocol, interfaces); mDevices.put(deviceName, device); - mSettingsManager.deviceAttached(device); + getCurrentSettings().deviceAttached(device); } } @@ -163,7 +160,7 @@ public class UsbHostManager { synchronized (mLock) { UsbDevice device = mDevices.remove(deviceName); if (device != null) { - mSettingsManager.deviceDetached(device); + getCurrentSettings().deviceDetached(device); } } } @@ -202,7 +199,7 @@ public class UsbHostManager { throw new IllegalArgumentException( "device " + deviceName + " does not exist or is restricted"); } - mSettingsManager.checkPermission(device); + getCurrentSettings().checkPermission(device); return nativeOpenDevice(deviceName); } } diff --git a/services/java/com/android/server/usb/UsbService.java b/services/java/com/android/server/usb/UsbService.java index bebcd5605fb5..629f5fa4bda8 100644 --- a/services/java/com/android/server/usb/UsbService.java +++ b/services/java/com/android/server/usb/UsbService.java @@ -17,15 +17,20 @@ package com.android.server.usb; import android.app.PendingIntent; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; import android.content.pm.PackageManager; import android.hardware.usb.IUsbManager; import android.hardware.usb.UsbAccessory; import android.hardware.usb.UsbDevice; -import android.net.Uri; -import android.os.Binder; import android.os.Bundle; import android.os.ParcelFileDescriptor; +import android.os.UserHandle; +import android.util.SparseArray; + +import com.android.internal.util.IndentingPrintWriter; import java.io.File; import java.io.FileDescriptor; @@ -37,21 +42,72 @@ import java.io.PrintWriter; * support is delegated to UsbDeviceManager. */ public class UsbService extends IUsbManager.Stub { + private static final String TAG = "UsbService"; + private final Context mContext; + private UsbDeviceManager mDeviceManager; private UsbHostManager mHostManager; - private final UsbSettingsManager mSettingsManager; + private final Object mLock = new Object(); + + /** Map from {@link UserHandle} to {@link UsbSettingsManager} */ + // @GuardedBy("mLock") + private final SparseArray<UsbSettingsManager> + mSettingsByUser = new SparseArray<UsbSettingsManager>(); + + private UsbSettingsManager getSettingsForUser(int userId) { + synchronized (mLock) { + UsbSettingsManager settings = mSettingsByUser.get(userId); + if (settings == null) { + settings = new UsbSettingsManager(mContext, new UserHandle(userId)); + mSettingsByUser.put(userId, settings); + } + return settings; + } + } public UsbService(Context context) { mContext = context; - mSettingsManager = new UsbSettingsManager(context); - PackageManager pm = mContext.getPackageManager(); + + final PackageManager pm = mContext.getPackageManager(); if (pm.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) { - mHostManager = new UsbHostManager(context, mSettingsManager); + mHostManager = new UsbHostManager(context); } if (new File("/sys/class/android_usb").exists()) { - mDeviceManager = new UsbDeviceManager(context, mSettingsManager); + mDeviceManager = new UsbDeviceManager(context); + } + + setCurrentUser(UserHandle.USER_OWNER); + + final IntentFilter userFilter = new IntentFilter(); + userFilter.addAction(Intent.ACTION_USER_SWITCHED); + userFilter.addAction(Intent.ACTION_USER_STOPPED); + mContext.registerReceiver(mUserReceiver, userFilter, null, null); + } + + private BroadcastReceiver mUserReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1); + final String action = intent.getAction(); + if (Intent.ACTION_USER_SWITCHED.equals(action)) { + setCurrentUser(userId); + } else if (Intent.ACTION_USER_STOPPED.equals(action)) { + synchronized (mLock) { + mSettingsByUser.remove(userId); + } + } + } + }; + + private void setCurrentUser(int userId) { + final UsbSettingsManager userSettings = getSettingsForUser(userId); + if (mHostManager != null) { + mHostManager.setCurrentSettings(userSettings); + } + if (mDeviceManager != null) { + mDeviceManager.setCurrentSettings(userSettings); } } @@ -65,6 +121,7 @@ public class UsbService extends IUsbManager.Stub { } /* Returns a list of all currently attached USB devices (host mdoe) */ + @Override public void getDeviceList(Bundle devices) { if (mHostManager != null) { mHostManager.getDeviceList(devices); @@ -72,6 +129,7 @@ public class UsbService extends IUsbManager.Stub { } /* Opens the specified USB device (host mode) */ + @Override public ParcelFileDescriptor openDevice(String deviceName) { if (mHostManager != null) { return mHostManager.openDevice(deviceName); @@ -81,6 +139,7 @@ public class UsbService extends IUsbManager.Stub { } /* returns the currently attached USB accessory (device mode) */ + @Override public UsbAccessory getCurrentAccessory() { if (mDeviceManager != null) { return mDeviceManager.getCurrentAccessory(); @@ -90,6 +149,7 @@ public class UsbService extends IUsbManager.Stub { } /* opens the currently attached USB accessory (device mode) */ + @Override public ParcelFileDescriptor openAccessory(UsbAccessory accessory) { if (mDeviceManager != null) { return mDeviceManager.openAccessory(accessory); @@ -98,54 +158,70 @@ public class UsbService extends IUsbManager.Stub { } } - public void setDevicePackage(UsbDevice device, String packageName) { + @Override + public void setDevicePackage(UsbDevice device, String packageName, int userId) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); - mSettingsManager.setDevicePackage(device, packageName); + getSettingsForUser(userId).setDevicePackage(device, packageName); } - public void setAccessoryPackage(UsbAccessory accessory, String packageName) { + @Override + public void setAccessoryPackage(UsbAccessory accessory, String packageName, int userId) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); - mSettingsManager.setAccessoryPackage(accessory, packageName); + getSettingsForUser(userId).setAccessoryPackage(accessory, packageName); } + @Override public boolean hasDevicePermission(UsbDevice device) { - return mSettingsManager.hasPermission(device); + final int userId = UserHandle.getCallingUserId(); + return getSettingsForUser(userId).hasPermission(device); } + @Override public boolean hasAccessoryPermission(UsbAccessory accessory) { - return mSettingsManager.hasPermission(accessory); + final int userId = UserHandle.getCallingUserId(); + return getSettingsForUser(userId).hasPermission(accessory); } - public void requestDevicePermission(UsbDevice device, String packageName, - PendingIntent pi) { - mSettingsManager.requestPermission(device, packageName, pi); + @Override + public void requestDevicePermission(UsbDevice device, String packageName, PendingIntent pi) { + final int userId = UserHandle.getCallingUserId(); + getSettingsForUser(userId).requestPermission(device, packageName, pi); } - public void requestAccessoryPermission(UsbAccessory accessory, String packageName, - PendingIntent pi) { - mSettingsManager.requestPermission(accessory, packageName, pi); + @Override + public void requestAccessoryPermission( + UsbAccessory accessory, String packageName, PendingIntent pi) { + final int userId = UserHandle.getCallingUserId(); + getSettingsForUser(userId).requestPermission(accessory, packageName, pi); } + @Override public void grantDevicePermission(UsbDevice device, int uid) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); - mSettingsManager.grantDevicePermission(device, uid); + final int userId = UserHandle.getUserId(uid); + getSettingsForUser(userId).grantDevicePermission(device, uid); } + @Override public void grantAccessoryPermission(UsbAccessory accessory, int uid) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); - mSettingsManager.grantAccessoryPermission(accessory, uid); + final int userId = UserHandle.getUserId(uid); + getSettingsForUser(userId).grantAccessoryPermission(accessory, uid); } - public boolean hasDefaults(String packageName) { + @Override + public boolean hasDefaults(String packageName, int userId) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); - return mSettingsManager.hasDefaults(packageName); + return getSettingsForUser(userId).hasDefaults(packageName); } - public void clearDefaults(String packageName) { + @Override + public void clearDefaults(String packageName, int userId) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); - mSettingsManager.clearDefaults(packageName); + getSettingsForUser(userId).clearDefaults(packageName); } + @Override public void setCurrentFunction(String function, boolean makeDefault) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); if (mDeviceManager != null) { @@ -155,6 +231,7 @@ public class UsbService extends IUsbManager.Stub { } } + @Override public void setMassStorageBackingFile(String path) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); if (mDeviceManager != null) { @@ -164,34 +241,41 @@ public class UsbService extends IUsbManager.Stub { } } + @Override public void allowUsbDebugging(boolean alwaysAllow, String publicKey) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); mDeviceManager.allowUsbDebugging(alwaysAllow, publicKey); } + @Override public void denyUsbDebugging() { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null); mDeviceManager.denyUsbDebugging(); } @Override - public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { - if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DUMP) - != PackageManager.PERMISSION_GRANTED) { - pw.println("Permission Denial: can't dump UsbManager from from pid=" - + Binder.getCallingPid() - + ", uid=" + Binder.getCallingUid()); - return; - } + public void dump(FileDescriptor fd, PrintWriter writer, String[] args) { + mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG); + final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " "); pw.println("USB Manager State:"); - if (mDeviceManager != null) { mDeviceManager.dump(fd, pw); } if (mHostManager != null) { mHostManager.dump(fd, pw); } - mSettingsManager.dump(fd, pw); + + synchronized (mLock) { + for (int i = 0; i < mSettingsByUser.size(); i++) { + final int userId = mSettingsByUser.keyAt(i); + final UsbSettingsManager settings = mSettingsByUser.valueAt(i); + pw.increaseIndent(); + pw.println("Settings for user " + userId + ":"); + settings.dump(fd, pw); + pw.decreaseIndent(); + } + } + pw.decreaseIndent(); } } diff --git a/services/java/com/android/server/usb/UsbSettingsManager.java b/services/java/com/android/server/usb/UsbSettingsManager.java index a8453d3d78b1..4b2bbfe0006b 100644 --- a/services/java/com/android/server/usb/UsbSettingsManager.java +++ b/services/java/com/android/server/usb/UsbSettingsManager.java @@ -33,9 +33,10 @@ import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbInterface; import android.hardware.usb.UsbManager; import android.os.Binder; -import android.os.FileUtils; -import android.os.Process; +import android.os.Environment; import android.os.UserHandle; +import android.util.AtomicFile; +import android.util.Log; import android.util.Slog; import android.util.SparseBooleanArray; import android.util.Xml; @@ -48,7 +49,6 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; -import java.io.BufferedOutputStream; import java.io.File; import java.io.FileDescriptor; import java.io.FileInputStream; @@ -60,13 +60,21 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -class UsbSettingsManager { +import libcore.io.IoUtils; +class UsbSettingsManager { private static final String TAG = "UsbSettingsManager"; private static final boolean DEBUG = false; - private static final File sSettingsFile = new File("/data/system/usb_device_manager.xml"); + + /** Legacy settings file, before multi-user */ + private static final File sSingleUserSettingsFile = new File( + "/data/system/usb_device_manager.xml"); + + private final UserHandle mUser; + private final AtomicFile mSettingsFile; private final Context mContext; + private final Context mUserContext; private final PackageManager mPackageManager; // Temporary mapping USB device name to list of UIDs with permissions for the device @@ -350,28 +358,49 @@ class UsbSettingsManager { } private class MyPackageMonitor extends PackageMonitor { - + @Override public void onPackageAdded(String packageName, int uid) { handlePackageUpdate(packageName); } + @Override public void onPackageChanged(String packageName, int uid, String[] components) { handlePackageUpdate(packageName); } + @Override public void onPackageRemoved(String packageName, int uid) { clearDefaults(packageName); } } + MyPackageMonitor mPackageMonitor = new MyPackageMonitor(); - public UsbSettingsManager(Context context) { + public UsbSettingsManager(Context context, UserHandle user) { + if (DEBUG) Slog.v(TAG, "Creating settings for " + user); + + try { + mUserContext = context.createPackageContextAsUser("android", 0, user); + } catch (NameNotFoundException e) { + throw new RuntimeException("Missing android package"); + } + mContext = context; - mPackageManager = context.getPackageManager(); + mPackageManager = mUserContext.getPackageManager(); + + mUser = user; + mSettingsFile = new AtomicFile(new File( + Environment.getUserSystemDirectory(user.getIdentifier()), + "usb_device_manager.xml")); + synchronized (mLock) { + if (UserHandle.OWNER.equals(user)) { + upgradeSingleUserLocked(); + } readSettingsLocked(); } - mPackageMonitor.register(context, null, true); + + mPackageMonitor.register(mUserContext, null, true); } private void readPreference(XmlPullParser parser) @@ -395,10 +424,54 @@ class UsbSettingsManager { XmlUtils.nextElement(parser); } + /** + * Upgrade any single-user settings from {@link #sSingleUserSettingsFile}. + * Should only by called by owner. + */ + private void upgradeSingleUserLocked() { + if (sSingleUserSettingsFile.exists()) { + mDevicePreferenceMap.clear(); + mAccessoryPreferenceMap.clear(); + + FileInputStream fis = null; + try { + fis = new FileInputStream(sSingleUserSettingsFile); + XmlPullParser parser = Xml.newPullParser(); + parser.setInput(fis, null); + + XmlUtils.nextElement(parser); + while (parser.getEventType() != XmlPullParser.END_DOCUMENT) { + final String tagName = parser.getName(); + if ("preference".equals(tagName)) { + readPreference(parser); + } else { + XmlUtils.nextElement(parser); + } + } + } catch (IOException e) { + Log.wtf(TAG, "Failed to read single-user settings", e); + } catch (XmlPullParserException e) { + Log.wtf(TAG, "Failed to read single-user settings", e); + } finally { + IoUtils.closeQuietly(fis); + } + + writeSettingsLocked(); + + // Success or failure, we delete single-user file + sSingleUserSettingsFile.delete(); + } + } + private void readSettingsLocked() { + if (DEBUG) Slog.v(TAG, "readSettingsLocked()"); + + mDevicePreferenceMap.clear(); + mAccessoryPreferenceMap.clear(); + FileInputStream stream = null; try { - stream = new FileInputStream(sSettingsFile); + stream = mSettingsFile.openRead(); XmlPullParser parser = Xml.newPullParser(); parser.setInput(stream, null); @@ -407,7 +480,7 @@ class UsbSettingsManager { String tagName = parser.getName(); if ("preference".equals(tagName)) { readPreference(parser); - } else { + } else { XmlUtils.nextElement(parser); } } @@ -415,25 +488,21 @@ class UsbSettingsManager { if (DEBUG) Slog.d(TAG, "settings file not found"); } catch (Exception e) { Slog.e(TAG, "error reading settings file, deleting to start fresh", e); - sSettingsFile.delete(); + mSettingsFile.delete(); } finally { - if (stream != null) { - try { - stream.close(); - } catch (IOException e) { - } - } + IoUtils.closeQuietly(stream); } } private void writeSettingsLocked() { + if (DEBUG) Slog.v(TAG, "writeSettingsLocked()"); + FileOutputStream fos = null; try { - FileOutputStream fstr = new FileOutputStream(sSettingsFile); - if (DEBUG) Slog.d(TAG, "writing settings to " + fstr); - BufferedOutputStream str = new BufferedOutputStream(fstr); + fos = mSettingsFile.startWrite(); + FastXmlSerializer serializer = new FastXmlSerializer(); - serializer.setOutput(str, "utf-8"); + serializer.setOutput(fos, "utf-8"); serializer.startDocument(null, true); serializer.setFeature("http://xmlpull.org/v1/doc/features.html#indent-output", true); serializer.startTag(null, "settings"); @@ -455,12 +524,12 @@ class UsbSettingsManager { serializer.endTag(null, "settings"); serializer.endDocument(); - str.flush(); - FileUtils.sync(fstr); - str.close(); - } catch (Exception e) { - Slog.e(TAG, "error writing settings file, deleting to start fresh", e); - sSettingsFile.delete(); + mSettingsFile.finishWrite(fos); + } catch (IOException e) { + Slog.e(TAG, "Failed to write settings", e); + if (fos != null) { + mSettingsFile.failWrite(fos); + } } } @@ -547,7 +616,7 @@ class UsbSettingsManager { } // Send broadcast to running activity with registered intent - mContext.sendBroadcastAsUser(intent, UserHandle.ALL); + mUserContext.sendBroadcast(intent); // Start activity with registered intent resolveActivity(intent, matches, defaultPackage, device, null); @@ -608,7 +677,7 @@ class UsbSettingsManager { dialogIntent.putExtra(UsbManager.EXTRA_ACCESSORY, accessory); dialogIntent.putExtra("uri", uri); try { - mContext.startActivity(dialogIntent); + mUserContext.startActivityAsUser(dialogIntent, mUser); } catch (ActivityNotFoundException e) { Slog.e(TAG, "unable to start UsbAccessoryUriActivity"); } @@ -656,7 +725,7 @@ class UsbSettingsManager { intent.setComponent( new ComponentName(defaultRI.activityInfo.packageName, defaultRI.activityInfo.name)); - mContext.startActivity(intent); + mUserContext.startActivityAsUser(intent, mUser); } catch (ActivityNotFoundException e) { Slog.e(TAG, "startActivity failed", e); } @@ -683,7 +752,7 @@ class UsbSettingsManager { resolverIntent.putExtra(Intent.EXTRA_INTENT, intent); } try { - mContext.startActivity(resolverIntent); + mUserContext.startActivityAsUser(resolverIntent, mUser); } catch (ActivityNotFoundException e) { Slog.e(TAG, "unable to start activity " + resolverIntent); } @@ -814,7 +883,7 @@ class UsbSettingsManager { } private void requestPermissionDialog(Intent intent, String packageName, PendingIntent pi) { - int uid = Binder.getCallingUid(); + final int uid = Binder.getCallingUid(); // compare uid with packageName to foil apps pretending to be someone else try { @@ -833,9 +902,9 @@ class UsbSettingsManager { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.putExtra(Intent.EXTRA_INTENT, pi); intent.putExtra("package", packageName); - intent.putExtra("uid", uid); + intent.putExtra(Intent.EXTRA_UID, uid); try { - mContext.startActivity(intent); + mUserContext.startActivityAsUser(intent, mUser); } catch (ActivityNotFoundException e) { Slog.e(TAG, "unable to start UsbPermissionActivity"); } finally { @@ -851,7 +920,7 @@ class UsbSettingsManager { intent.putExtra(UsbManager.EXTRA_DEVICE, device); intent.putExtra(UsbManager.EXTRA_PERMISSION_GRANTED, true); try { - pi.send(mContext, 0, intent); + pi.send(mUserContext, 0, intent); } catch (PendingIntent.CanceledException e) { if (DEBUG) Slog.d(TAG, "requestPermission PendingIntent was cancelled"); } @@ -864,14 +933,14 @@ class UsbSettingsManager { } public void requestPermission(UsbAccessory accessory, String packageName, PendingIntent pi) { - Intent intent = new Intent(); + Intent intent = new Intent(); // respond immediately if permission has already been granted if (hasPermission(accessory)) { intent.putExtra(UsbManager.EXTRA_ACCESSORY, accessory); intent.putExtra(UsbManager.EXTRA_PERMISSION_GRANTED, true); - try { - pi.send(mContext, 0, intent); + try { + pi.send(mUserContext, 0, intent); } catch (PendingIntent.CanceledException e) { if (DEBUG) Slog.d(TAG, "requestPermission PendingIntent was cancelled"); } diff --git a/services/java/com/android/server/wm/DimAnimator.java b/services/java/com/android/server/wm/DimAnimator.java index 9bca83483ef1..5874202dfaeb 100644 --- a/services/java/com/android/server/wm/DimAnimator.java +++ b/services/java/com/android/server/wm/DimAnimator.java @@ -30,37 +30,37 @@ import java.io.PrintWriter; * all state used for dim animation. */ class DimAnimator { + static final String TAG = "DimAnimator"; + Surface mDimSurface; boolean mDimShown = false; float mDimCurrentAlpha; float mDimTargetAlpha; float mDimDeltaPerMs; long mLastDimAnimTime; - + int mLastDimWidth, mLastDimHeight; DimAnimator (SurfaceSession session, final int layerStack) { - if (mDimSurface == null) { - try { - if (WindowManagerService.DEBUG_SURFACE_TRACE) { - mDimSurface = new WindowStateAnimator.SurfaceTrace(session, - "DimAnimator", - 16, 16, PixelFormat.OPAQUE, - Surface.FX_SURFACE_DIM | Surface.HIDDEN); - } else { - mDimSurface = new Surface(session, "DimAnimator", - 16, 16, PixelFormat.OPAQUE, - Surface.FX_SURFACE_DIM | Surface.HIDDEN); - } - if (WindowManagerService.SHOW_TRANSACTIONS || - WindowManagerService.SHOW_SURFACE_ALLOC) Slog.i(WindowManagerService.TAG, - " DIM " + mDimSurface + ": CREATE"); - mDimSurface.setLayerStack(layerStack); - mDimSurface.setAlpha(0.0f); - mDimSurface.show(); - } catch (Exception e) { - Slog.e(WindowManagerService.TAG, "Exception creating Dim surface", e); + try { + if (WindowManagerService.DEBUG_SURFACE_TRACE) { + mDimSurface = new WindowStateAnimator.SurfaceTrace(session, + "DimAnimator", + 16, 16, PixelFormat.OPAQUE, + Surface.FX_SURFACE_DIM | Surface.HIDDEN); + } else { + mDimSurface = new Surface(session, "DimAnimator", + 16, 16, PixelFormat.OPAQUE, + Surface.FX_SURFACE_DIM | Surface.HIDDEN); } + if (WindowManagerService.SHOW_TRANSACTIONS || + WindowManagerService.SHOW_SURFACE_ALLOC) Slog.i(WindowManagerService.TAG, + " DIM " + mDimSurface + ": CREATE"); + mDimSurface.setLayerStack(layerStack); + mDimSurface.setAlpha(0.0f); + mDimSurface.show(); + } catch (Exception e) { + Slog.e(WindowManagerService.TAG, "Exception creating Dim surface", e); } } @@ -69,6 +69,11 @@ class DimAnimator { * {@link #updateSurface} after all windows are examined. */ void updateParameters(final Resources res, final Parameters params, final long currentTime) { + if (mDimSurface == null) { + Slog.e(TAG, "updateParameters: no Surface"); + return; + } + // Multiply by 1.5 so that rotating a frozen surface that includes this does not expose a // corner. final int dw = (int) (params.mDimWidth * 1.5); @@ -133,6 +138,11 @@ class DimAnimator { * false when the animation is finished and the dim surface is hidden. */ boolean updateSurface(boolean dimming, long currentTime, boolean displayFrozen) { + if (mDimSurface == null) { + Slog.e(TAG, "updateSurface: no Surface"); + return false; + } + if (!dimming) { if (mDimTargetAlpha != 0) { mLastDimAnimTime = currentTime; @@ -187,6 +197,13 @@ class DimAnimator { return animating; } + public void kill() { + if (mDimSurface != null) { + mDimSurface.destroy(); + mDimSurface = null; + } + } + public void printTo(String prefix, PrintWriter pw) { pw.print(prefix); pw.print("mDimSurface="); pw.print(mDimSurface); diff --git a/services/java/com/android/server/wm/DimSurface.java b/services/java/com/android/server/wm/DimSurface.java index ddbd70db1123..4225868b2f10 100644 --- a/services/java/com/android/server/wm/DimSurface.java +++ b/services/java/com/android/server/wm/DimSurface.java @@ -24,6 +24,8 @@ import android.view.SurfaceSession; import java.io.PrintWriter; class DimSurface { + static final String TAG = "DimSurface"; + Surface mDimSurface; boolean mDimShown = false; int mDimColor = 0; @@ -31,27 +33,25 @@ class DimSurface { int mLastDimWidth, mLastDimHeight; DimSurface(SurfaceSession session, final int layerStack) { - if (mDimSurface == null) { - try { - if (WindowManagerService.DEBUG_SURFACE_TRACE) { - mDimSurface = new WindowStateAnimator.SurfaceTrace(session, - "DimSurface", - 16, 16, PixelFormat.OPAQUE, - Surface.FX_SURFACE_DIM | Surface.HIDDEN); - } else { - mDimSurface = new Surface(session, "DimSurface", - 16, 16, PixelFormat.OPAQUE, - Surface.FX_SURFACE_DIM | Surface.HIDDEN); - } - if (WindowManagerService.SHOW_TRANSACTIONS || - WindowManagerService.SHOW_SURFACE_ALLOC) Slog.i(WindowManagerService.TAG, - " DIM " + mDimSurface + ": CREATE"); - mDimSurface.setLayerStack(layerStack); - mDimSurface.setAlpha(0.0f); - mDimSurface.show(); - } catch (Exception e) { - Slog.e(WindowManagerService.TAG, "Exception creating Dim surface", e); + try { + if (WindowManagerService.DEBUG_SURFACE_TRACE) { + mDimSurface = new WindowStateAnimator.SurfaceTrace(session, + "DimSurface", + 16, 16, PixelFormat.OPAQUE, + Surface.FX_SURFACE_DIM | Surface.HIDDEN); + } else { + mDimSurface = new Surface(session, "DimSurface", + 16, 16, PixelFormat.OPAQUE, + Surface.FX_SURFACE_DIM | Surface.HIDDEN); } + if (WindowManagerService.SHOW_TRANSACTIONS || + WindowManagerService.SHOW_SURFACE_ALLOC) Slog.i(WindowManagerService.TAG, + " DIM " + mDimSurface + ": CREATE"); + mDimSurface.setLayerStack(layerStack); + mDimSurface.setAlpha(0.0f); + mDimSurface.show(); + } catch (Exception e) { + Slog.e(WindowManagerService.TAG, "Exception creating Dim surface", e); } } @@ -59,6 +59,11 @@ class DimSurface { * Show the dim surface. */ void show(int dw, int dh, int layer, int color) { + if (mDimSurface == null) { + Slog.e(TAG, "show: no Surface"); + return; + } + if (!mDimShown) { if (WindowManagerService.SHOW_TRANSACTIONS) Slog.i(WindowManagerService.TAG, " DIM " + mDimSurface + ": SHOW pos=(0,0) (" + dw + "x" + dh + " layer=" + layer + ")"); @@ -88,6 +93,11 @@ class DimSurface { } void hide() { + if (mDimSurface == null) { + Slog.e(TAG, "hide: no Surface"); + return; + } + if (mDimShown) { mDimShown = false; try { @@ -99,6 +109,13 @@ class DimSurface { } } + void kill() { + if (mDimSurface != null) { + mDimSurface.destroy(); + mDimSurface = null; + } + } + public void printTo(String prefix, PrintWriter pw) { pw.print(prefix); pw.print("mDimSurface="); pw.println(mDimSurface); pw.print(prefix); pw.print("mDimShown="); pw.print(mDimShown); diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 377e89ce1a34..b67fb5197b46 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -147,6 +147,22 @@ public class WindowAnimator { } void removeDisplayLocked(final int displayId) { + final DisplayContentsAnimator displayAnimator = mDisplayContentsAnimators.get(displayId); + if (displayAnimator != null) { + if (displayAnimator.mWindowAnimationBackgroundSurface != null) { + displayAnimator.mWindowAnimationBackgroundSurface.kill(); + displayAnimator.mWindowAnimationBackgroundSurface = null; + } + if (displayAnimator.mScreenRotationAnimation != null) { + displayAnimator.mScreenRotationAnimation.kill(); + displayAnimator.mScreenRotationAnimation = null; + } + if (displayAnimator.mDimAnimator != null) { + displayAnimator.mDimAnimator.kill(); + displayAnimator.mDimAnimator = null; + } + } + mDisplayContentsAnimators.delete(displayId); } @@ -527,11 +543,15 @@ public class WindowAnimator { } } - windowAnimationBackgroundSurface.show(mDw, mDh, - animLayer - WindowManagerService.LAYER_OFFSET_DIM, - windowAnimationBackgroundColor); + if (windowAnimationBackgroundSurface != null) { + windowAnimationBackgroundSurface.show(mDw, mDh, + animLayer - WindowManagerService.LAYER_OFFSET_DIM, + windowAnimationBackgroundColor); + } } else { - windowAnimationBackgroundSurface.hide(); + if (windowAnimationBackgroundSurface != null) { + windowAnimationBackgroundSurface.hide(); + } } } @@ -643,9 +663,8 @@ public class WindowAnimator { final DimAnimator.Parameters dimParams = displayAnimator.mDimParams; final DimAnimator dimAnimator = displayAnimator.mDimAnimator; - if (dimParams != null) { - dimAnimator.updateParameters( - mContext.getResources(), dimParams, mCurrentTime); + if (dimAnimator != null && dimParams != null) { + dimAnimator.updateParameters(mContext.getResources(), dimParams, mCurrentTime); } if (dimAnimator != null && dimAnimator.mDimShown) { mAnimating |= dimAnimator.updateSurface(isDimmingLocked(displayId), @@ -801,9 +820,9 @@ public class WindowAnimator { private class DisplayContentsAnimator { WinAnimatorList mWinAnimators = new WinAnimatorList(); - final DimAnimator mDimAnimator; + DimAnimator mDimAnimator = null; DimAnimator.Parameters mDimParams = null; - final DimSurface mWindowAnimationBackgroundSurface; + DimSurface mWindowAnimationBackgroundSurface = null; ScreenRotationAnimation mScreenRotationAnimation = null; public DisplayContentsAnimator(int displayId) { diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index ae805c38c7e5..180579dc025c 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -3639,8 +3639,6 @@ public class WindowManagerService extends IWindowManager.Stub if (wtoken != null) { boolean delayed = false; if (!wtoken.hidden) { - wtoken.hidden = true; - final int N = wtoken.windows.size(); boolean changed = false; @@ -3661,6 +3659,8 @@ public class WindowManagerService extends IWindowManager.Stub } } + wtoken.hidden = true; + if (changed) { performLayoutAndPlaceSurfacesLocked(); updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL, @@ -10870,8 +10870,8 @@ public class WindowManagerService extends IWindowManager.Stub final DisplayContent displayContent = getDisplayContentLocked(displayId); mDisplayContents.delete(displayId); WindowList windows = displayContent.getWindowList(); - for (int i = windows.size() - 1; i >= 0; --i) { - final WindowState win = windows.get(i); + while (!windows.isEmpty()) { + final WindowState win = windows.get(windows.size() - 1); removeWindowLocked(win.mSession, win); } mAnimator.removeDisplayLocked(displayId); diff --git a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Blur25.java b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Blur25.java index a2e42988815d..0c6d41d85450 100644 --- a/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Blur25.java +++ b/tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Blur25.java @@ -33,7 +33,7 @@ public class Blur25 extends TestBase { private int MAX_RADIUS = 25; private ScriptC_threshold mScript; - private int mRadius = MAX_RADIUS; + private float mRadius = MAX_RADIUS; private float mSaturation = 1.0f; private Allocation mScratchPixelsAllocation1; private Allocation mScratchPixelsAllocation2; @@ -51,13 +51,14 @@ public class Blur25 extends TestBase { public void onBar1Changed(int progress) { - float fRadius = progress / 100.0f; - fRadius *= (float)(MAX_RADIUS); - mRadius = (int)fRadius; + mRadius = ((float)progress) / 100.0f * MAX_RADIUS; + if (mRadius <= 0.10f) { + mRadius = 0.10f; + } if (mUseIntrinsic) { mIntrinsic.setRadius(mRadius); } else { - mScript.invoke_setRadius(mRadius); + mScript.invoke_setRadius((int)mRadius); } } @@ -111,7 +112,7 @@ public class Blur25 extends TestBase { if (mUseIntrinsic) { mIntrinsic.setRadius(mRadius); } else { - mScript.invoke_setRadius(mRadius); + mScript.invoke_setRadius((int)mRadius); } } } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java index 5e23f24a5639..1ccbc40752dd 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java @@ -60,7 +60,12 @@ public class BridgePowerManager implements IPowerManager { } @Override - public void reboot(String arg0) throws RemoteException { + public void reboot(boolean confirm, String reason, boolean wait) { + // pass for now. + } + + @Override + public void shutdown(boolean confirm, boolean wait) { // pass for now. } diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index ef57e638120f..ca329e60487e 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -1662,7 +1662,6 @@ public class WifiP2pService extends IWifiP2pManager.Stub { private void stopDhcpServer(String intf) { try { mNwService.stopTethering(); - mNwService.clearInterfaceAddresses(intf); } catch (Exception e) { loge("Error stopping Dhcp server" + e); return; @@ -2166,6 +2165,13 @@ public class WifiP2pService extends IWifiP2pManager.Stub { mDhcpStateMachine = null; } + try { + mNwService.clearInterfaceAddresses(mGroup.getInterface()); + } catch (Exception e) { + loge("Failed to clear addresses " + e); + } + NetworkUtils.resetConnections(mGroup.getInterface(), NetworkUtils.RESET_ALL_ADDRESSES); + mGroup = null; mWifiNative.p2pFlush(); mServiceDiscReqId = null; |
