Launcher: Show system settings if on CyanogenMod

http://review.cyanogenmod.org/#/c/55923/

Change-Id: I7deb3f55aacda09777e0b39821a45971dad4f43a

1 files changed, 9 insertions, 3 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 936c431a0..3d3b8b0d0 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -972,9 +972,15 @@ public class Launcher extends Activity
     }
 
     protected void startSettings() {
-        Intent settings = new Intent().setClass(this, SettingsActivity.class);
-        settings.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+        Intent settings;
+        // If we are on CyanogenMod the launcher settings are accessed from system settings.
+        if (!getPackageManager().hasSystemFeature("com.cyanogenmod.android")) {
+            settings = new Intent().setClass(this, SettingsActivity.class);
+            settings.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                    | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+        } else {
+            settings = new Intent(android.provider.Settings.ACTION_SETTINGS);
+        }
         startActivity(settings);
         if (mWorkspace.isInOverviewMode()) {
             mWorkspace.exitOverviewMode(false);