diff options
6 files changed, 35 insertions, 3 deletions
diff --git a/core/res/res/values-cs/cm_strings.xml b/core/res/res/values-cs/cm_strings.xml index 8d61e9f..00519c4 100644 --- a/core/res/res/values-cs/cm_strings.xml +++ b/core/res/res/values-cs/cm_strings.xml @@ -48,4 +48,12 @@ <string name="toast_rotation_unlocked">Otáčení zobrazení povoleno</string> <string name="toast_rotation_locked">Otáčení zobrazení zakázáno</string> <string name="stylus_app_not_installed">Aplikace %s není nainstalována</string> + + <string name="permlab_changePrivacyGuardState">povolit či zakázat ochranu soukromí</string> + <string name="permdesc_changePrivacyGuardState">Umožní změnit pravidla, zda bude některá aplikace spuštěna v režimu ochrany soukromí. Pokud je aplikace spuštěna v režimu ochrany soukromí, tato aplikace nemá umožněn přístup k osobním datům jako jsou kontakty, historie volání nebo zprávy.</string> + <string name="privacy_guard_notification">Ochrana soukromí aktivní</string> + <string name="privacy_guard_notification_detail">Aplikaci <xliff:g id="app">%1$s</xliff:g> nebude umožňen přístup k osobním údajům</string> + + <string name="profile_picker_title">Profily</string> + <string name="profile_none">Žádný</string> </resources> diff --git a/core/res/res/values-it/cm_strings.xml b/core/res/res/values-it/cm_strings.xml index 1429c7e..7e11e80 100644 --- a/core/res/res/values-it/cm_strings.xml +++ b/core/res/res/values-it/cm_strings.xml @@ -54,4 +54,10 @@ <string name="permlab_fm_radio_transmitter">controllo del trasmettitore FM</string> <string name="permdesc_fm_radio_transmitter">Consente all\'applicazione di controllare il trasmettitore FM.</string> <string name="stylus_app_not_installed">%s non è installato</string> + <string name="permlab_changePrivacyGuardState">abilita o disabilita Privacy Guard</string> + <string name="permdesc_changePrivacyGuardState">Consente all\'applicazione di decidere se un\'altra applicazione viene eseguita con Privacy Guard. Quando un\'applicazione viene eseguita con Privacy Guard, non ha accesso a dati personali come contatti, lista chiamate o messaggi.</string> + <string name="privacy_guard_notification">Privacy Guard attiva</string> + <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> non sarà in grado di accedere ai dati personali</string> + <string name="profile_picker_title">Profili</string> + <string name="profile_none">Nessuno</string> </resources> diff --git a/packages/SystemUI/res/values-cs/cm_strings.xml b/packages/SystemUI/res/values-cs/cm_strings.xml index a97ceb1..6f8114a 100644 --- a/packages/SystemUI/res/values-cs/cm_strings.xml +++ b/packages/SystemUI/res/values-cs/cm_strings.xml @@ -47,8 +47,10 @@ <string name="quick_settings_quiethours_off">Čas klidu vyp.</string> <string name="quick_settings_lte_off">LTE vyp.</string> <string name="quick_settings_volume">Hlasitost</string> + <string name="quick_settings_camera_label">Fotoaparát</string> <string name="quick_settings_expanded_desktop">Rozšířený</string> <string name="quick_settings_expanded_desktop_off">Normální</string> + <string name="quick_settings_camera_error_connect">Fotoaparát nelze spustit</string> <string name="navbar_dialog_title">Vybrat akci k přiřazení</string> <string name="navbar_home_button">Tlačítko Domů</string> <string name="navbar_recent_button">Tlačítko Nedávné</string> diff --git a/packages/SystemUI/res/values-it/cm_strings.xml b/packages/SystemUI/res/values-it/cm_strings.xml index 62de97c..0c5ba51 100644 --- a/packages/SystemUI/res/values-it/cm_strings.xml +++ b/packages/SystemUI/res/values-it/cm_strings.xml @@ -52,8 +52,10 @@ <string name="quick_settings_lte">LTE</string> <string name="quick_settings_lte_off">LTE OFF</string> <string name="quick_settings_volume">Volume</string> + <string name="quick_settings_camera_label">Fotocamera</string> <string name="quick_settings_expanded_desktop">Esteso</string> <string name="quick_settings_expanded_desktop_off">Normale</string> + <string name="quick_settings_camera_error_connect">Impossibile connettersi alla fotocamera</string> <string name="navbar_dialog_title">Azione da associare</string> <string name="navbar_home_button">Pulsante Home</string> <string name="navbar_recent_button">Pulsante Recenti</string> 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 f5fff53..09a13da 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java @@ -171,7 +171,7 @@ public class PhoneStatusBarView extends PanelBar { mBar.updatePieTriggerMask(PiePosition.LEFT.FLAG | PiePosition.TOP.FLAG | PiePosition.RIGHT.FLAG - | PiePosition.TOP.FLAG); + | PiePosition.BOTTOM.FLAG); } @Override diff --git a/services/java/com/android/server/NotificationManagerService.java b/services/java/com/android/server/NotificationManagerService.java index 06a8615..8a02380 100644 --- a/services/java/com/android/server/NotificationManagerService.java +++ b/services/java/com/android/server/NotificationManagerService.java @@ -149,6 +149,7 @@ public class NotificationManagerService extends INotificationManager.Stub // for enabling and disabling notification pulse behaviour private boolean mScreenOn = true; + private boolean mDreaming = false; private boolean mInCall = false; private boolean mNotificationPulseEnabled; private HashMap<String, NotificationLedValues> mNotificationPulseCustomLedValues; @@ -587,6 +588,14 @@ public class NotificationManagerService extends INotificationManager.Stub } else if (action.equals(Intent.ACTION_SCREEN_OFF)) { mScreenOn = false; updateNotificationPulse(); + } else if (action.equals(Intent.ACTION_DREAMING_STARTED)) { + mDreaming = true; + updateNotificationPulse(); + } else if (action.equals(Intent.ACTION_DREAMING_STOPPED)) { + mDreaming = false; + if (mScreenOn) { + mNotificationLight.turnOff(); + } } else if (action.equals(TelephonyManager.ACTION_PHONE_STATE_CHANGED)) { mInCall = (intent.getStringExtra(TelephonyManager.EXTRA_STATE).equals( TelephonyManager.EXTRA_STATE_OFFHOOK)); @@ -598,7 +607,9 @@ public class NotificationManagerService extends INotificationManager.Stub } } else if (action.equals(Intent.ACTION_USER_PRESENT)) { // turn off LED when user passes through lock screen - mNotificationLight.turnOff(); + if (!mDreaming) { + mNotificationLight.turnOff(); + } } } }; @@ -780,6 +791,8 @@ public class NotificationManagerService extends INotificationManager.Stub filter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED); filter.addAction(Intent.ACTION_USER_PRESENT); filter.addAction(Intent.ACTION_USER_STOPPED); + filter.addAction(Intent.ACTION_DREAMING_STARTED); + filter.addAction(Intent.ACTION_DREAMING_STOPPED); mContext.registerReceiver(mIntentReceiver, filter); IntentFilter pkgFilter = new IntentFilter(); pkgFilter.addAction(Intent.ACTION_PACKAGE_REMOVED); @@ -1592,7 +1605,8 @@ public class NotificationManagerService extends INotificationManager.Stub } // Don't flash while we are in a call, screen is on or we are in quiet hours with light dimmed - if (mLedNotification == null || mInCall || mScreenOn || (inQuietHours() && mQuietHoursDim)) { + if (mLedNotification == null || mInCall + || (mScreenOn && !mDreaming) || (inQuietHours() && mQuietHoursDim)) { mNotificationLight.turnOff(); } else { int ledARGB; |