summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SettingsActivity.java
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2015-08-12 01:05:08 +0200
committerAdnan Begovic <adnan@cyngn.com>2015-12-01 14:09:26 -0800
commit8d17b9a2f33925c6678b1718dae29abfc7e2c989 (patch)
tree29ed65233460a30179d8fcb59ac67408bf7b58f6 /src/com/android/settings/SettingsActivity.java
parentc9503e0919ddeae38da404fbec6772bba52e0626 (diff)
downloadpackages_apps_Settings-8d17b9a2f33925c6678b1718dae29abfc7e2c989.zip
packages_apps_Settings-8d17b9a2f33925c6678b1718dae29abfc7e2c989.tar.gz
packages_apps_Settings-8d17b9a2f33925c6678b1718dae29abfc7e2c989.tar.bz2
settings: contributors cloud
Squash of: settings: remove contributors cloud margin/padding Change-Id: I120e7bd1611bd47126d91ca1f88ce5cdb964fed8 Signed-off-by: Jorge Ruesga <jorge@ruesga.com> Settings: update contributors cloud Generated date: 3rd November 2015: 09:29 Change-Id: I7bc707f3896f91b3fd7d0f9f76700e3938f1a4b2 Change-Id: If5b89e0d278b7a0c85c966e09264b60927889fc9 JIRA: CML-133 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
-rw-r--r--src/com/android/settings/SettingsActivity.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 5dcff22..9dc5021 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -81,6 +81,7 @@ import com.android.settings.applications.UsageAccessDetails;
import com.android.settings.applications.WriteSettingsDetails;
import com.android.settings.blacklist.BlacklistSettings;
import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.contributors.ContributorsCloudFragment;
import com.android.settings.cyanogenmod.DisplayRotation;
import com.android.settings.dashboard.DashboardCategory;
import com.android.settings.dashboard.DashboardSummary;
@@ -367,7 +368,8 @@ public class SettingsActivity extends Activity
LiveDisplay.class.getName(),
com.android.settings.cyanogenmod.DisplayRotation.class.getName(),
com.android.settings.cyanogenmod.PrivacySettings.class.getName(),
- BlacklistSettings.class.getName()
+ BlacklistSettings.class.getName(),
+ ContributorsCloudFragment.class.getName()
};
@@ -1561,5 +1563,4 @@ public class SettingsActivity extends Activity
super.onNewIntent(intent);
}
-}
-
+} \ No newline at end of file