diff options
| -rw-r--r-- | core/java/com/android/internal/logging/MetricsConstants.java | 25 | ||||
| -rw-r--r-- | core/java/com/android/internal/logging/MetricsLogger.java | 19 | ||||
| -rw-r--r-- | core/java/com/android/internal/os/storage/ExternalStorageFormatter.java | 146 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values-en-rAU/strings.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values-en-rGB/strings.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values-en-rIN/strings.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values-ml-rIN/strings.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values-si-rLK/strings.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values-zu/strings.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 24 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 7 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/SysUIToast.java | 31 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java | 3 |
14 files changed, 71 insertions, 224 deletions
diff --git a/core/java/com/android/internal/logging/MetricsConstants.java b/core/java/com/android/internal/logging/MetricsConstants.java index 8c6b79b..400c442 100644 --- a/core/java/com/android/internal/logging/MetricsConstants.java +++ b/core/java/com/android/internal/logging/MetricsConstants.java @@ -22,6 +22,7 @@ package com.android.internal.logging; */ public interface MetricsConstants { // These constants must match those in the analytic pipeline, do not edit. + // Add temporary values to the top of MetricsLogger instead. public static final int VIEW_UNKNOWN = 0; public static final int MAIN_SETTINGS = 1; public static final int ACCESSIBILITY = 2; @@ -82,7 +83,6 @@ public interface MetricsConstants { public static final int INPUTMETHOD_LANGUAGE = 57; public static final int INPUTMETHOD_KEYBOARD = 58; public static final int INPUTMETHOD_SPELL_CHECKERS = 59; - public static final int INPUTMETHOD_SUBTYPE_ENABLER = 60; public static final int INPUTMETHOD_USER_DICTIONARY = 61; public static final int INPUTMETHOD_USER_DICTIONARY_ADD_WORD = 62; public static final int LOCATION = 63; @@ -229,6 +229,29 @@ public interface MetricsConstants { public static final int ACTION_NOTE_CONTROLS = 204; public static final int ACTION_NOTE_INFO = 205; public static final int ACTION_APP_NOTE_SETTINGS = 206; + public static final int VOLUME_DIALOG = 207; + public static final int VOLUME_DIALOG_DETAILS = 208; + public static final int ACTION_VOLUME_SLIDER = 209; + public static final int ACTION_VOLUME_STREAM = 210; + public static final int ACTION_VOLUME_KEY = 211; + public static final int ACTION_VOLUME_ICON = 212; + public static final int ACTION_RINGER_MODE = 213; + public static final int ACTION_ACTIVITY_CHOOSER_SHOWN = 214; + public static final int ACTION_ACTIVITY_CHOOSER_PICKED_APP_TARGET = 215; + public static final int ACTION_ACTIVITY_CHOOSER_PICKED_SERVICE_TARGET = 216; + public static final int ACTION_ACTIVITY_CHOOSER_PICKED_STANDARD_TARGET = 217; + public static final int ACTION_BRIGHTNESS = 218; + public static final int ACTION_BRIGHTNESS_AUTO = 219; + public static final int BRIGHTNESS_DIALOG = 220; + public static final int SYSTEM_ALERT_WINDOW_APPS = 221; + public static final int DREAMING = 222; + public static final int DOZING = 223; + public static final int OVERVIEW_ACTIVITY = 224; + public static final int ABOUT_LEGAL_SETTINGS = 225; + public static final int ACTION_SEARCH_RESULTS = 226; + + // These constants must match those in the analytic pipeline, do not edit. + // Add temporary values to the top of MetricsLogger instead. //aliases public static final int DEVICEINFO_STORAGE = DEVICEINFO_MEMORY; diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java index 66fa8fc..cbe535f 100644 --- a/core/java/com/android/internal/logging/MetricsLogger.java +++ b/core/java/com/android/internal/logging/MetricsLogger.java @@ -26,25 +26,8 @@ import android.view.View; * @hide */ public class MetricsLogger implements MetricsConstants { - public static final int VOLUME_DIALOG = 207; - public static final int VOLUME_DIALOG_DETAILS = 208; - public static final int ACTION_VOLUME_SLIDER = 209; - public static final int ACTION_VOLUME_STREAM = 210; - public static final int ACTION_VOLUME_KEY = 211; - public static final int ACTION_VOLUME_ICON = 212; - public static final int ACTION_RINGER_MODE = 213; - public static final int ACTION_ACTIVITY_CHOOSER_SHOWN = 214; - public static final int ACTION_ACTIVITY_CHOOSER_PICKED_APP_TARGET = 215; - public static final int ACTION_ACTIVITY_CHOOSER_PICKED_SERVICE_TARGET = 216; - public static final int ACTION_ACTIVITY_CHOOSER_PICKED_STANDARD_TARGET = 217; - public static final int ACTION_BRIGHTNESS = 218; - public static final int ACTION_BRIGHTNESS_AUTO = 219; - public static final int BRIGHTNESS_DIALOG = 220; - public static final int SYSTEM_ALERT_WINDOW_APPS = 221; - public static final int DREAMING = 222; - public static final int DOZING = 223; - public static final int OVERVIEW_ACTIVITY = 224; // Temporary constants go here, to await migration to MetricsConstants. + // next value is 227; public static void visible(Context context, int category) throws IllegalArgumentException { if (Build.IS_DEBUGGABLE && category == VIEW_UNKNOWN) { diff --git a/core/java/com/android/internal/os/storage/ExternalStorageFormatter.java b/core/java/com/android/internal/os/storage/ExternalStorageFormatter.java deleted file mode 100644 index 0a01ae9..0000000 --- a/core/java/com/android/internal/os/storage/ExternalStorageFormatter.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.android.internal.os.storage; - -import android.app.ProgressDialog; -import android.app.Service; -import android.content.ComponentName; -import android.content.Context; -import android.content.Intent; -import android.os.IBinder; -import android.os.PowerManager; -import android.os.storage.StorageManager; -import android.os.storage.StorageVolume; -import android.util.Slog; -import android.view.WindowManager; -import android.widget.Toast; - -import com.android.internal.R; - -/** - * Takes care of unmounting and formatting external storage. - * - * @deprecated Please use {@link Intent#ACTION_MASTER_CLEAR} broadcast with extra - * {@link Intent#EXTRA_WIPE_EXTERNAL_STORAGE} to wipe and factory reset, or call - * {@link StorageManager#wipeAdoptableDisks} directly to format external storages. - */ -public class ExternalStorageFormatter extends Service { - static final String TAG = "ExternalStorageFormatter"; - - public static final String FORMAT_ONLY = "com.android.internal.os.storage.FORMAT_ONLY"; - public static final String FORMAT_AND_FACTORY_RESET = "com.android.internal.os.storage.FORMAT_AND_FACTORY_RESET"; - - public static final String EXTRA_ALWAYS_RESET = "always_reset"; - - public static final ComponentName COMPONENT_NAME - = new ComponentName("android", ExternalStorageFormatter.class.getName()); - - private StorageManager mStorageManager; - - private PowerManager.WakeLock mWakeLock; - - private ProgressDialog mProgressDialog = null; - - private boolean mFactoryReset = false; - private boolean mAlwaysReset = false; - private String mReason = null; - - @Override - public void onCreate() { - super.onCreate(); - - mStorageManager = getSystemService(StorageManager.class); - - mWakeLock = ((PowerManager)getSystemService(Context.POWER_SERVICE)) - .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "ExternalStorageFormatter"); - mWakeLock.acquire(); - } - - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - if (FORMAT_AND_FACTORY_RESET.equals(intent.getAction())) { - mFactoryReset = true; - } - if (intent.getBooleanExtra(EXTRA_ALWAYS_RESET, false)) { - mAlwaysReset = true; - } - - mReason = intent.getStringExtra(Intent.EXTRA_REASON); - StorageVolume userVol = intent.getParcelableExtra(StorageVolume.EXTRA_STORAGE_VOLUME); - if (userVol == null) { - Slog.w(TAG, "Missing explicit storage volume; assuming default"); - userVol = mStorageManager.getPrimaryVolume(); - } - - final String volumeId = userVol.getId(); - - mProgressDialog = new ProgressDialog(this); - mProgressDialog.setIndeterminate(true); - mProgressDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); - mProgressDialog.setMessage(getText(R.string.progress_unmounting)); - mProgressDialog.show(); - - new FormatTask(volumeId).start(); - - return Service.START_REDELIVER_INTENT; - } - - private class FormatTask extends Thread { - private final String mVolumeId; - - public FormatTask(String volumeId) { - mVolumeId = volumeId; - } - - @Override - public void run() { - boolean success = false; - try { - mStorageManager.format(mVolumeId); - success = true; - } catch (Exception e) { - Slog.w(TAG, "Failed to format", e); - Toast.makeText(ExternalStorageFormatter.this, - R.string.format_error, Toast.LENGTH_LONG).show(); - } - if (success) { - if (mFactoryReset) { - Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); - intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); - intent.putExtra(Intent.EXTRA_REASON, mReason); - sendBroadcast(intent); - // Intent handling is asynchronous -- assume it will happen soon. - stopSelf(); - return; - } - } - // If we didn't succeed, or aren't doing a full factory - // reset, then it is time to remount the storage. - if (!success && mAlwaysReset) { - Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR); - intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); - intent.putExtra(Intent.EXTRA_REASON, mReason); - sendBroadcast(intent); - } else { - try { - mStorageManager.mount(mVolumeId); - } catch (Exception e) { - Slog.w(TAG, "Failed to mount", e); - } - } - stopSelf(); - } - } - - @Override - public void onDestroy() { - if (mProgressDialog != null) { - mProgressDialog.dismiss(); - } - mWakeLock.release(); - super.onDestroy(); - } - - @Override - public IBinder onBind(Intent intent) { - return null; - } -} diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index f7c446b..ba51b23c 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2784,10 +2784,6 @@ </intent-filter> </receiver> - <service android:name="com.android.internal.os.storage.ExternalStorageFormatter" - android:permission="android.permission.MASTER_CLEAR" - android:exported="true" /> - <service android:name="android.hardware.location.GeofenceHardwareService" android:permission="android.permission.LOCATION_HARDWARE" android:exported="false" /> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 5f46af5..ee1eaff 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -354,10 +354,8 @@ <string name="permdesc_flashlight" msgid="6522284794568368310">"Allows the app to control the flashlight."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"directly call phone numbers"</string> <string name="permdesc_callPhone" msgid="3740797576113760827">"Allows the app to call phone numbers without your intervention. This may result in unexpected charges or calls. Note that this doesn\'t allow the app to call emergency numbers. Malicious apps may cost you money by making calls without your confirmation."</string> - <!-- no translation found for permlab_accessImsCallService (3574943847181793918) --> - <skip /> - <!-- no translation found for permdesc_accessImsCallService (8992884015198298775) --> - <skip /> + <string name="permlab_accessImsCallService" msgid="3574943847181793918">"access IMS call service"</string> + <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"Allows the app to use the IMS service to make calls without your intervention."</string> <string name="permlab_readPhoneState" msgid="9178228524507610486">"read phone status and identity"</string> <string name="permdesc_readPhoneState" msgid="1639212771826125528">"Allows the app to access the phone features of the device. This permission allows the app to determine the phone number and device IDs, whether a call is active and the remote number connected by a call."</string> <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"prevent tablet from sleeping"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 5f46af5..ee1eaff 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -354,10 +354,8 @@ <string name="permdesc_flashlight" msgid="6522284794568368310">"Allows the app to control the flashlight."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"directly call phone numbers"</string> <string name="permdesc_callPhone" msgid="3740797576113760827">"Allows the app to call phone numbers without your intervention. This may result in unexpected charges or calls. Note that this doesn\'t allow the app to call emergency numbers. Malicious apps may cost you money by making calls without your confirmation."</string> - <!-- no translation found for permlab_accessImsCallService (3574943847181793918) --> - <skip /> - <!-- no translation found for permdesc_accessImsCallService (8992884015198298775) --> - <skip /> + <string name="permlab_accessImsCallService" msgid="3574943847181793918">"access IMS call service"</string> + <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"Allows the app to use the IMS service to make calls without your intervention."</string> <string name="permlab_readPhoneState" msgid="9178228524507610486">"read phone status and identity"</string> <string name="permdesc_readPhoneState" msgid="1639212771826125528">"Allows the app to access the phone features of the device. This permission allows the app to determine the phone number and device IDs, whether a call is active and the remote number connected by a call."</string> <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"prevent tablet from sleeping"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 5f46af5..ee1eaff 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -354,10 +354,8 @@ <string name="permdesc_flashlight" msgid="6522284794568368310">"Allows the app to control the flashlight."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"directly call phone numbers"</string> <string name="permdesc_callPhone" msgid="3740797576113760827">"Allows the app to call phone numbers without your intervention. This may result in unexpected charges or calls. Note that this doesn\'t allow the app to call emergency numbers. Malicious apps may cost you money by making calls without your confirmation."</string> - <!-- no translation found for permlab_accessImsCallService (3574943847181793918) --> - <skip /> - <!-- no translation found for permdesc_accessImsCallService (8992884015198298775) --> - <skip /> + <string name="permlab_accessImsCallService" msgid="3574943847181793918">"access IMS call service"</string> + <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"Allows the app to use the IMS service to make calls without your intervention."</string> <string name="permlab_readPhoneState" msgid="9178228524507610486">"read phone status and identity"</string> <string name="permdesc_readPhoneState" msgid="1639212771826125528">"Allows the app to access the phone features of the device. This permission allows the app to determine the phone number and device IDs, whether a call is active and the remote number connected by a call."</string> <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"prevent tablet from sleeping"</string> diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml index 2ba49a2..7cdabc5 100644 --- a/core/res/res/values-ml-rIN/strings.xml +++ b/core/res/res/values-ml-rIN/strings.xml @@ -354,10 +354,8 @@ <string name="permdesc_flashlight" msgid="6522284794568368310">"ഫ്ലാഷ്ലൈറ്റിനെ നിയന്ത്രിക്കുന്നതിന് അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ഫോൺ നമ്പറുകളിലേക്ക് നേരിട്ട് വിളിക്കുക"</string> <string name="permdesc_callPhone" msgid="3740797576113760827">"നിങ്ങളുടെ ഇടപെടൽ ഇല്ലാതെ ഫോൺ നമ്പറുകളിലേക്ക് കോൾ ചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ഇത് അപ്രതീക്ഷിത നിരക്കുകൾക്കോ കോളുകൾക്കോ ഇടയാക്കാം. ഇത് അടിയന്തര നമ്പറുകളിലേക്ക് വിളിക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കില്ലെന്ന കാര്യം ശ്രദ്ധിക്കുക. ക്ഷുദ്രകരമായ അപ്ലിക്കേഷനുകൾ നിങ്ങളുടെ സ്ഥിരീകരണമില്ലാതെ കോളുകൾ ചെയ്യുന്നത് പണച്ചെലവിനിടയാക്കാം."</string> - <!-- no translation found for permlab_accessImsCallService (3574943847181793918) --> - <skip /> - <!-- no translation found for permdesc_accessImsCallService (8992884015198298775) --> - <skip /> + <string name="permlab_accessImsCallService" msgid="3574943847181793918">"IMS കോൾ സേവനം ആക്സസ് ചെയ്യുക"</string> + <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"നിങ്ങളുടെ ഇടപെടൽ ഇല്ലാതെ കോളുകൾ ചെയ്യാൻ IMS സേവനം ഉപയോഗിക്കുന്നതിന് ആപ്പിനെ അനുവദിക്കുന്നു."</string> <string name="permlab_readPhoneState" msgid="9178228524507610486">"ഫോൺ നിലയും ഐഡന്റിറ്റിയും റീഡുചെയ്യുക"</string> <string name="permdesc_readPhoneState" msgid="1639212771826125528">"ഉപകരണത്തിന്റെ ഫോൺ സവിശേഷതകൾ ആക്സസ്സുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ഈ അനുമതി ഫോൺ നമ്പർ, ഉപകരണ ഐഡികൾ, ഒരു കോൾ സജീവമാണോയെന്നത്, ഒരു കോൾ കണക്റ്റുചെയ്ത വിദൂര നമ്പർ എന്നിവ നിർണ്ണയിക്കാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string> <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"സുഷുപ്തിയിലാകുന്നതിൽ നിന്ന് ടാബ്ലെറ്റിനെ തടയുക"</string> diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml index 63cbc40..705d493 100644 --- a/core/res/res/values-si-rLK/strings.xml +++ b/core/res/res/values-si-rLK/strings.xml @@ -354,10 +354,8 @@ <string name="permdesc_flashlight" msgid="6522284794568368310">"සැණෙළිය පාලනයට යෙදුමට අවසර දෙන්න."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"දුරකථන අංක වෙත ඍජුවම අමතන්න"</string> <string name="permdesc_callPhone" msgid="3740797576113760827">"ඔබගේ මැදිහත් වීමක් නොමැතිව දුරකථන අංක ඇමතීමට යෙදුමට අවසර දෙන්න. මෙහි ප්රතිඑලය වන්නේ අනපේක්ෂිත අයකිරීම් හෝ ඇමතුම් ඇතිවීමයි. මෙයන් හදිසි අංක වලට ඇමතුම් ගැනීමට යෙදුමට අවසර නොදෙන බවට සටහන් කරගන්න. ඔබගේ අනුදැනුමක් නොමැතිව ඇමතුම් ගැනීමෙන් අනිෂ්ට යෙදුම් ඔබගේ මුදල් නිකරුණේ වැය කරයි."</string> - <!-- no translation found for permlab_accessImsCallService (3574943847181793918) --> - <skip /> - <!-- no translation found for permdesc_accessImsCallService (8992884015198298775) --> - <skip /> + <string name="permlab_accessImsCallService" msgid="3574943847181793918">"IMS ඇමතුම් සේවාවට පිවිසෙන්න"</string> + <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"ඔබේ මැදිහත්වීමකින් තොරව ඇමතුම් සිදු කිරීමට IMS සේවාව භාවිතයට යෙදුමට ඉඩ දෙන්න."</string> <string name="permlab_readPhoneState" msgid="9178228524507610486">"දුරකථනයේ තත්වය සහ අනන්යතාවය කියවීම"</string> <string name="permdesc_readPhoneState" msgid="1639212771826125528">"උපාංගයේ දුරකථන විශේෂාංග වෙත පිවිසීමට යෙදුමට අවසර දෙන්න. ඇමතුම සක්රිය වුවත් සහ ඇමතුමකින් දුරස්ථ අංකය සම්බන්ධ වුවත් දුරකථන අංකය සහ උපාංග ID හඳුනා ගැනීමට මෙම අවසරය යෙදුමට අවසර දෙයි."</string> <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"ටැබ්ලටය නින්දෙන් වැළක්වීම"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index fa0c76d..1bc1cab 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -354,10 +354,8 @@ <string name="permdesc_flashlight" msgid="6522284794568368310">"Ivumela uhlelo lokusebenza ukulawula ukukhanya kwefuleshi."</string> <string name="permlab_callPhone" msgid="3925836347681847954">"ngokuqondile shayela izinombolo zocingo"</string> <string name="permdesc_callPhone" msgid="3740797576113760827">"Ivumela uhlelo lokusebenza ukushayela izinombolo zefoni ngaphandle kokuhlanganyela kwakho. Lokhu kungaholela emashajini noma amakholi angalindelekile. Qaphela ukuthi lokhu akuvumeli uhlelo lokusebenza ukushayela izinombolo zesimo esiphuthumayo. Izinhlelo zokusebenza ezingalungile zingabiza imali ngokwenze amakholi ngaphandle kokuqinisekisa kwakho."</string> - <!-- no translation found for permlab_accessImsCallService (3574943847181793918) --> - <skip /> - <!-- no translation found for permdesc_accessImsCallService (8992884015198298775) --> - <skip /> + <string name="permlab_accessImsCallService" msgid="3574943847181793918">"finyelela kusevisi yekholi ye-IMS"</string> + <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"Ivumela uhlelo lokusebenza ukuthi lusebenzise isevisi ye-IMS ukuze yenze amakholi ngaphandle kokungenelela kwakho."</string> <string name="permlab_readPhoneState" msgid="9178228524507610486">"funda isimo sefoni kanye nesazisi"</string> <string name="permdesc_readPhoneState" msgid="1639212771826125528">"Ivumela uhlelo lokusebenza ukufinyelela izici zefoni zedivayisi. Le mvume ivumela uhlelo lokusebenza ukucacisa inombolo yefoni nobunikazi bedivayisi, ukuthi noma ikholi iyasebenza, futhi nenombolo yesilawuli kude zixhunywe ngekholi."</string> <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"gwema ithebhulethi ukuba ingalali"</string> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index a6c4fcc..35c1f0e 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3168,33 +3168,11 @@ <!-- Label for the "Done" button on the far left of action mode toolbars. --> <string name="action_mode_done">Done</string> - <!-- Strings for ExternalStorageFormatter service. --> - <!-- Text for progress dialog while unmounting USB storage volume [CHAR LIMIT=NONE] --> - <string name="progress_unmounting" product="nosdcard">Unmounting USB storage\u2026</string> - <!-- Text for progress dialog while unmounting SD card [CHAR LIMIT=NONE] --> - <string name="progress_unmounting" product="default">Unmounting SD card\u2026</string> + <!-- Strings for MasterClearReceiver. --> <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] --> <string name="progress_erasing" product="nosdcard">Erasing USB storage\u2026</string> <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] --> <string name="progress_erasing" product="default">Erasing SD card\u2026</string> - <!-- Text for message to user that an error happened when formatting USB storage [CHAR LIMIT=NONE] --> - <string name="format_error" product="nosdcard">Couldn\'t erase USB storage.</string> - <!-- Text for message to user that an error happened when formatting SD card [CHAR LIMIT=NONE] --> - <string name="format_error" product="default">Couldn\'t erase SD card.</string> - <!-- Text for message to user that SD card has been removed while in use [CHAR LIMIT=NONE] --> - <string name="media_bad_removal">SD card was removed before being unmounted.</string> - <!-- Text for message to user USB storage is currently being checked [CHAR LIMIT=NONE] --> - <string name="media_checking" product="nosdcard">USB storage is currently being checked.</string> - <!-- Text for message to user SD card is currently being checked [CHAR LIMIT=NONE] --> - <string name="media_checking" product="default">SD card is currently being checked.</string> - <!-- Text for message to user SD card has been removed [CHAR LIMIT=NONE] --> - <string name="media_removed">SD card has been removed.</string> - <!-- Text for message to user USB storage is currently mounted on a computer [CHAR LIMIT=NONE] --> - <string name="media_shared" product="nosdcard">USB storage is currently in use by a computer.</string> - <!-- Text for message to user SD card is currently mounted on a computer [CHAR LIMIT=NONE] --> - <string name="media_shared" product="default">SD card is currently in use by a computer.</string> - <!-- Text for message for an unknown external media state [CHAR LIMIT=NONE] --> - <string name="media_unknown_state">External media in unknown state.</string> <!-- Text for WebView's text selection Action Mode --> <!-- ActionBar action to share the current selection [CHAR LIMIT=10] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index fcdaba2..d41031c 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -627,7 +627,6 @@ <java-symbol type="string" name="eventTypeOther" /> <java-symbol type="string" name="fileSizeSuffix" /> <java-symbol type="string" name="force_close" /> - <java-symbol type="string" name="format_error" /> <java-symbol type="string" name="gadget_host_error_inflating" /> <java-symbol type="string" name="gigabyteShort" /> <java-symbol type="string" name="gpsNotifMessage" /> @@ -711,11 +710,6 @@ <java-symbol type="string" name="lockscreen_emergency_call" /> <java-symbol type="string" name="lockscreen_return_to_call" /> <java-symbol type="string" name="low_memory" /> - <java-symbol type="string" name="media_bad_removal" /> - <java-symbol type="string" name="media_checking" /> - <java-symbol type="string" name="media_removed" /> - <java-symbol type="string" name="media_shared" /> - <java-symbol type="string" name="media_unknown_state" /> <java-symbol type="string" name="megabyteShort" /> <java-symbol type="string" name="midnight" /> <java-symbol type="string" name="mismatchPin" /> @@ -814,7 +808,6 @@ <java-symbol type="string" name="print_service_installed_title" /> <java-symbol type="string" name="print_service_installed_message" /> <java-symbol type="string" name="progress_erasing" /> - <java-symbol type="string" name="progress_unmounting" /> <java-symbol type="string" name="mobile_provisioning_apn" /> <java-symbol type="string" name="mobile_provisioning_url" /> <java-symbol type="string" name="quick_contacts_not_available" /> diff --git a/packages/SystemUI/src/com/android/systemui/SysUIToast.java b/packages/SystemUI/src/com/android/systemui/SysUIToast.java new file mode 100644 index 0000000..89bc82f --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/SysUIToast.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui; + +import android.content.Context; +import android.view.WindowManager; +import android.widget.Toast; + +public class SysUIToast { + + public static Toast makeText(Context context, CharSequence text, int duration) { + Toast toast = Toast.makeText(context, text, duration); + toast.getWindowParams().privateFlags |= + WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS; + return toast; + } + +} diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java index 359ed5f..781ab1c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java @@ -33,6 +33,7 @@ import android.widget.Toast; import com.android.internal.logging.MetricsLogger; import com.android.systemui.Prefs; import com.android.systemui.R; +import com.android.systemui.SysUIToast; import com.android.systemui.qs.QSTile; import com.android.systemui.statusbar.policy.ZenModeController; import com.android.systemui.volume.ZenModePanel; @@ -102,7 +103,7 @@ public class DndTile extends QSTile<QSTile.BooleanState> { if (mController.isVolumeRestricted()) { // Collapse the panels, so the user can see the toast. mHost.collapsePanels(); - Toast.makeText(mContext, mContext.getString( + SysUIToast.makeText(mContext, mContext.getString( com.android.internal.R.string.error_message_change_not_allowed), Toast.LENGTH_LONG).show(); return; |