Toggles: Preferences Enabled for Ribbons

If toggle is in ribbon we should enable the preferences as well, I'd assume. Change-Id: I0adb07de880570415243ac91a023be4c28a36799
AOKP · Jun 1, 2013 · f9425b8 · f9425b8
1 parent 07abbdf
commit f9425b8
Showing 1 changed file with 29 additions and 3 deletions.
diff --git a/src/com/aokp/romcontrol/fragments/StatusBarToggles.java b/src/com/aokp/romcontrol/fragments/StatusBarToggles.java
@@ -932,19 +932,45 @@ public void onChange(boolean selfChange) {
     }
 
     private void updateSettings() {
+        boolean screenshotRibbon = false;
+        boolean favoriteRibbon = false;
+        boolean customRibbon = false;
         ContentResolver resolver = mContext.getContentResolver();
         String currentToggles = Settings.System.getString(resolver, Settings.System.QUICK_TOGGLES);
+        ArrayList<String> leftSwipeToggles = Settings.System.getArrayList(mContentRes,
+                Settings.System.SWIPE_RIBBON_TOGGLES[0]);
+        ArrayList<String> rightSwipeToggles = Settings.System.getArrayList(mContentRes,
+                Settings.System.SWIPE_RIBBON_TOGGLES[1]);
+        ArrayList<String> bottomSwipeToggles = Settings.System.getArrayList(mContentRes,
+                Settings.System.SWIPE_RIBBON_TOGGLES[2]);
+        ArrayList<String> swipeToggles = new ArrayList<String>();
+        swipeToggles.addAll(leftSwipeToggles);
+        swipeToggles.addAll(rightSwipeToggles);
+        swipeToggles.addAll(bottomSwipeToggles);
+
+        for (int i = 0; i < swipeToggles.size(); i++) {
+            if (swipeToggles.get(i).equals("FAVCONTACT")) {
+                favoriteRibbon = true;
+            }
+            if (swipeToggles.get(i).equals("SCREENSHOT")) {
+                screenshotRibbon = true;
+            }
+            if (swipeToggles.get(i).equals("CUSTOM")) {
+                customRibbon = true;
+            }
+        }
+
         if (currentToggles == null)
             currentToggles = "";
         if (currentToggles != null) {
             if (mFavContact != null) {
-                mFavContact.setEnabled(currentToggles.contains("FAVCONTACT"));
+                mFavContact.setEnabled(currentToggles.contains("FAVCONTACT") || favoriteRibbon);
             }
             if (mScreenshotDelay != null) {
-                mScreenshotDelay.setEnabled(currentToggles.contains("SCREENSHOT"));
+                mScreenshotDelay.setEnabled(currentToggles.contains("SCREENSHOT") || screenshotRibbon);
             }
             if (mCustomCat != null && mCustomButtons != null) {
-                boolean enabled = currentToggles.contains("CUSTOM");
+                boolean enabled = currentToggles.contains("CUSTOM") || customRibbon;
                 mCustomCat.setEnabled(enabled);
                 mCustomButtons.setEnabled(enabled);
                 for (int i = 0; i < 5; i++) {