Settings: allow Profiles to be launched externally

Change-Id: I620be76139989722ac722f00259425c237a1c66e
Signed-off-by: Roman Birg <roman@cyngn.com>

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 77ef4f8..c1d2673 100755 (executable)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2131,7 +2131,6 @@
         />
 
         <!-- CyanogenMod activities Start -->
-        <activity android:name=".profiles.ProfilesSettings" />
         <activity android:name="Settings$ProfilesSettingsActivity"
                 android:label="@string/profile_settings"
                 android:taskAffinity=""

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 53cdbaa..d78da1b 100644 (file)
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -121,6 +121,7 @@ public class Settings extends SettingsActivity {
     public static class LiveDisplayActivity extends SettingsActivity { /* empty */ }
     public static class DisplayRotationActivity extends SettingsActivity { /* empty */ }
     public static class BlacklistSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class ProfilesSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AnonymousStatsActivity extends Settings { /* empty */ }
     public static class ContributorsCloudActivity extends SettingsActivity { /* empty */ }
     public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 9670139..de0afe8 100644 (file)
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -99,6 +99,7 @@ import com.android.settings.notification.NotificationManagerSettings;
 import com.android.settings.notification.OtherSoundSettings;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.profiles.NFCProfileTagCallback;
+import com.android.settings.profiles.ProfilesSettings;
 import com.android.settings.search.DynamicIndexableContentMonitor;
 import com.android.settings.search.Index;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
@@ -371,6 +372,7 @@ public class SettingsActivity extends Activity
             com.android.settings.cyanogenmod.DisplayRotation.class.getName(),
             com.android.settings.cyanogenmod.PrivacySettings.class.getName(),
             BlacklistSettings.class.getName(),
+            ProfilesSettings.class.getName(),
             ContributorsCloudFragment.class.getName(),
             NotificationManagerSettings.class.getName()
     };