CFibers - Swipe to Float for notifications and recents [2/2]

Change-Id: Iea7c361ef0055bc54e7507f762e705d5c5c54658 Signed-off-by: Stefano Mura [STELIX PippoX3] <[email protected]>
Carbonite12 · Oct 30, 2014 · 27a9086 · 27a9086
1 parent 1f3d44f
commit 27a9086
Show file tree

Hide file tree

Showing 8 changed files with 105 additions and 6 deletions.
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
@@ -179,6 +179,19 @@
   <string name="clear_button_top_right">In alto a destra</string>
   <string name="clear_button_bottom_left">In basso a sinistra</string>
   <string name="clear_button_bottom_right">In basso a destra</string>
+
+    <!-- Recents Swipe in Floating Mode -->
+    <string name="recents_swipe_floating_title">Lancia recente in fluttuante</string>
+    <string name="recents_swipe_floating_ask">Chiedi dopo</string>
+    <string name="recents_swipe_floating_yes">Si</string>
+    <string name="recents_swipe_floating_no">No</string>
+
+    <!-- Status Bar Notifications Swipe in Floating Mode -->
+    <string name="status_bar_notification_swipe_floating_title">Lancia Notifica in fluttuante</string>
+    <string name="status_bar_notification_swipe_floating_ask">Chiedi dopo</string>
+    <string name="status_bar_notification_swipe_floating_yes">Si</string>
+    <string name="status_bar_notification_swipe_floating_no">No</string>
+
   <string name="ram_circle_title">Cerchio della RAM</string>
   <string name="ram_bar">Barra della RAM</string>
   <string name="ram_bar_note_title">Note</string>
@@ -994,7 +1007,7 @@
   <string name="heads_up_time_out_8sec">8 secondi</string>
   <string name="heads_up_time_out_10sec">10 secondi</string>
   <string name="heads_up_time_out_never">Mai</string>
-  <string name="heads_up_exclude_from_lock_screen">Disabilita nella schermata di blocco</string>
+  <string name="heads_up_exclude_from_lock_screen">Disabilita nella lockscreen</string>
   <string name="heads_up_bg_color_title">Colore sfondo</string>
   <string name="heads_up_text_color_title">Colore testo</string>
 

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
@@ -1219,6 +1219,32 @@
         <item>10000</item>
     </string-array>
 
+    <!-- Swipe Recents to launch in floating mode -->
+    <string-array name="recents_swipe_floating_entries" translatable="false">
+        <item>@string/recents_swipe_floating_yes</item>
+        <item>@string/recents_swipe_floating_no</item>
+        <item>@string/recents_swipe_floating_ask</item>
+    </string-array>
+
+    <string-array name="recents_swipe_floating_values" translatable="false">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <!-- Swipe Status Bar Notifications to launch in floating mode -->
+    <string-array name="status_bar_notification_swipe_floating_entries" translatable="false">
+        <item>@string/status_bar_notification_swipe_floating_yes</item>
+        <item>@string/status_bar_notification_swipe_floating_no</item>
+        <item>@string/status_bar_notification_swipe_floating_ask</item>
+    </string-array>
+
+    <string-array name="status_bar_notification_swipe_floating_values" translatable="false">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
     <!-- Network Traffic Display States -->
     <string-array name="show_network_traffic_state_entries" translatable="false">
         <item>@string/show_network_traffic_disable</item>

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -242,6 +242,18 @@
     <!-- RAM circle -->
     <string name="ram_circle_title">RAM circle</string>
 
+    <!-- Recents Swipe in Floating Mode -->
+    <string name="recents_swipe_floating_title">Launch recent in floating</string>
+    <string name="recents_swipe_floating_ask">Ask later</string>
+    <string name="recents_swipe_floating_yes">Yes</string>
+    <string name="recents_swipe_floating_no">No</string>
+
+    <!-- Status Bar Notifications Swipe in Floating Mode -->
+    <string name="status_bar_notification_swipe_floating_title">Launch SB Notifications in floating</string>
+    <string name="status_bar_notification_swipe_floating_ask">Ask later</string>
+    <string name="status_bar_notification_swipe_floating_yes">Yes</string>
+    <string name="status_bar_notification_swipe_floating_no">No</string>
+
     <!-- Recents Ram Bar -->
     <string name="ram_bar">RAM bar</string>
     <string name="ram_bar_note_title">Note</string>

diff --git 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" />
 
-        <PreferenceScreen
-            android:key="heads_up"
-            android:title="@string/heads_up_title"
-            android:fragment="com.carbon.fibers.fragments.sb.HeadsUpSettings" />
-
         <com.carbon.fibers.preference.SystemSettingCheckBoxPreference
             android:key="double_tap_sleep_gesture"
             android:title="@string/status_bar_double_tap_to_sleep_title" />

diff --git 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" />
 
+
+    <PreferenceScreen
+        android:key="heads_up"
+        android:title="@string/heads_up_title"
+        android:fragment="com.carbon.fibers.fragments.sb.HeadsUpSettings" />
+
+    <ListPreference
+        android:key="status_bar_notification_swipe_floating"
+        android:title="@string/status_bar_notification_swipe_floating_title"
+        android:dialogTitle="@string/status_bar_notification_swipe_floating_title"
+        android:entries="@array/status_bar_notification_swipe_floating_entries"
+        android:entryValues="@array/status_bar_notification_swipe_floating_values" />
+
      <com.carbon.fibers.fragments.sb.CustomCarrier
          android:key="notification_custom_carrier_label"
          android:title="@string/notification_custom_carrier_label_title"

diff --git a/res/xml/ui_recents_panel.xml b/res/xml/ui_recents_panel.xml
@@ -36,4 +36,11 @@
         android:entries="@array/ram_circle_entries"
         android:entryValues="@array/ram_circle_values" />
 
+    <ListPreference
+        android:key="recents_swipe_floating"
+        android:title="@string/recents_swipe_floating_title"
+        android:dialogTitle="@string/recents_swipe_floating_title"
+        android:entries="@array/recents_swipe_floating_entries"
+        android:entryValues="@array/recents_swipe_floating_values" />
+
 </PreferenceScreen>
diff --git 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
@@ -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;
     }