diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 34d5a4d..a8e9025 100755 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -179,6 +179,19 @@ In alto a destra In basso a sinistra In basso a destra + + + Lancia recente in fluttuante + Chiedi dopo + Si + No + + + Lancia Notifica in fluttuante + Chiedi dopo + Si + No + Cerchio della RAM Barra della RAM Note @@ -994,7 +1007,7 @@ 8 secondi 10 secondi Mai - Disabilita nella schermata di blocco + Disabilita nella lockscreen Colore sfondo Colore testo diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 0e011c4..8389357 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1219,6 +1219,32 @@ 10000 + + + @string/recents_swipe_floating_yes + @string/recents_swipe_floating_no + @string/recents_swipe_floating_ask + + + + 1 + 2 + 3 + + + + + @string/status_bar_notification_swipe_floating_yes + @string/status_bar_notification_swipe_floating_no + @string/status_bar_notification_swipe_floating_ask + + + + 1 + 2 + 3 + + @string/show_network_traffic_disable diff --git a/res/values/strings.xml b/res/values/strings.xml index bbe1e9e..534d510 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -242,6 +242,18 @@ RAM circle + + Launch recent in floating + Ask later + Yes + No + + + Launch SB Notifications in floating + Ask later + Yes + No + RAM bar Note diff --git a/res/xml/sb_general_settings.xml b/res/xml/sb_general_settings.xml index e3701e1..7073393 100644 --- a/res/xml/sb_general_settings.xml +++ b/res/xml/sb_general_settings.xml @@ -27,11 +27,6 @@ android:dependency="custom_system_icon_color" android:defaultValue="0xFFFFFFFF" /> - - diff --git a/res/xml/sb_notification_drawer.xml b/res/xml/sb_notification_drawer.xml index b5eec59..adb42a2 100644 --- a/res/xml/sb_notification_drawer.xml +++ b/res/xml/sb_notification_drawer.xml @@ -57,6 +57,19 @@ android:entryValues="@array/notification_hide_labels_values" android:persistent="false" /> + + + + + + + diff --git a/src/com/carbon/fibers/fragments/sb/NotificationDrawer.java b/src/com/carbon/fibers/fragments/sb/NotificationDrawer.java index d30a5b1..37cdb45 100644 --- a/src/com/carbon/fibers/fragments/sb/NotificationDrawer.java +++ b/src/com/carbon/fibers/fragments/sb/NotificationDrawer.java @@ -32,7 +32,10 @@ public class NotificationDrawer extends SettingsPreferenceFragment implements private static final String UI_COLLAPSE_BEHAVIOUR = "notification_drawer_collapse_on_dismiss"; private static final String PREF_NOTIFICATION_HIDE_LABELS = "notification_hide_labels"; + private static final String STATUS_BAR_NOTIFICATION_SWIPE_FLOATING = "status_bar_notification_swipe_floating"; + private ListPreference mCollapseOnDismiss; + private ListPreference mStatusBarNotificationSwipeFloating; ListPreference mHideLabels; @@ -49,6 +52,13 @@ public void onCreate(Bundle savedInstanceState) { mHideLabels.setOnPreferenceChangeListener(this); updateHideNotificationLabelsSummary(hideCarrier); + mStatusBarNotificationSwipeFloating = (ListPreference) findPreference(STATUS_BAR_NOTIFICATION_SWIPE_FLOATING); + int StatusBarNotificationSwipeFloatingStatus = Settings.System.getInt(getActivity().getContentResolver(), + Settings.System.STATUS_BAR_NOTIFICATION_SWIPE_FLOATING, 0); + mStatusBarNotificationSwipeFloating.setValue(String.valueOf(StatusBarNotificationSwipeFloatingStatus)); + mStatusBarNotificationSwipeFloating.setSummary(mStatusBarNotificationSwipeFloating.getEntry()); + mStatusBarNotificationSwipeFloating.setOnPreferenceChangeListener(this); + /* Tablet case in handled in PhoneStatusBar if (!DeviceUtils.isPhone(getActivity()) || !DeviceUtils.deviceSupportsMobileData(getActivity())) { @@ -80,6 +90,13 @@ public boolean onPreferenceChange(Preference preference, Object objValue) { hideLabels); updateHideNotificationLabelsSummary(hideLabels); return true; + } else if (preference == mStatusBarNotificationSwipeFloating) { + int value = Integer.valueOf((String) objValue); + int index = mStatusBarNotificationSwipeFloating.findIndexOfValue((String) objValue); + Settings.System.putInt(getActivity().getContentResolver(), + Settings.System.STATUS_BAR_NOTIFICATION_SWIPE_FLOATING, value); + mStatusBarNotificationSwipeFloating.setSummary(mStatusBarNotificationSwipeFloating.getEntries()[index]); + return true; } return false; } diff --git a/src/com/carbon/fibers/fragments/ui/RecentsPanel.java b/src/com/carbon/fibers/fragments/ui/RecentsPanel.java index 2518645..3e21319 100644 --- a/src/com/carbon/fibers/fragments/ui/RecentsPanel.java +++ b/src/com/carbon/fibers/fragments/ui/RecentsPanel.java @@ -31,9 +31,11 @@ public class RecentsPanel extends SettingsPreferenceFragment implements private static final String CLEAR_RECENTS_BUTTON = "clear_recents_button"; private static final String RAM_CIRCLE = "ram_circle"; + private static final String RECENTS_SWIPE_FLOATING = "recents_swipe_floating"; private ListPreference mClearAllButton; private ListPreference mRamCircle; + private ListPreference mRecentsSwipeFloating; @Override public void onCreate(Bundle savedInstanceState) { @@ -56,6 +58,13 @@ public void onCreate(Bundle savedInstanceState) { mRamCircle.setValue(String.valueOf(circleStatus)); mRamCircle.setSummary(mRamCircle.getEntry()); mRamCircle.setOnPreferenceChangeListener(this); + + mRecentsSwipeFloating = (ListPreference) findPreference(RECENTS_SWIPE_FLOATING); + int RecentsSwipeFloatingStatus = Settings.System.getInt(getActivity().getContentResolver(), + Settings.System.RECENTS_SWIPE_FLOATING, 0); + mRecentsSwipeFloating.setValue(String.valueOf(RecentsSwipeFloatingStatus)); + mRecentsSwipeFloating.setSummary(mRecentsSwipeFloating.getEntry()); + mRecentsSwipeFloating.setOnPreferenceChangeListener(this); } public boolean onPreferenceChange(Preference preference, Object objValue) { @@ -73,6 +82,13 @@ public boolean onPreferenceChange(Preference preference, Object objValue) { Settings.System.RAM_CIRCLE, value); mRamCircle.setSummary(mRamCircle.getEntries()[index]); return true; + } else if (preference == mRecentsSwipeFloating) { + int value = Integer.valueOf((String) objValue); + int index = mRecentsSwipeFloating.findIndexOfValue((String) objValue); + Settings.System.putInt(getActivity().getContentResolver(), + Settings.System.RECENTS_SWIPE_FLOATING, value); + mRecentsSwipeFloating.setSummary(mRecentsSwipeFloating.getEntries()[index]); + return true; } return false; }