diff options
| -rwxr-xr-x | AndroidManifest.xml | 17 | ||||
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 3 | ||||
| -rw-r--r-- | src/com/android/settings/Settings.java | 1 |
3 files changed, 20 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f38e0bc..9196532 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2784,6 +2784,23 @@ android:resource="@id/lockscreen_settings" /> </activity> + <activity android:name=".Settings$LiveLockScreenSettingsActivity" + android:label="@string/live_lock_screen_title" + android:taskAffinity=""> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.VOICE_LAUNCH" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.SHORTCUT" /> + </intent-filter> + <intent-filter> + <action android:name="cyanogenmod.intent.action.OPEN_LIVE_LOCKSCREEN_SETTINGS" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <meta-data android:name="com.android.settings.FRAGMENT_CLASS" + android:value="com.android.settings.cyanogenmod.LiveLockScreenSettings" /> + </activity> + <provider android:name=".search.SettingsSearchIndexablesProvider" android:authorities="com.android.settings" diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 8f2db6b..d311134 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -71,6 +71,7 @@ import java.util.ArrayList; import java.util.List; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; +import static cyanogenmod.content.Intent.ACTION_OPEN_LIVE_LOCKSCREEN_SETTINGS; /** * Gesture lock pattern settings. @@ -349,7 +350,7 @@ public class SecuritySettings extends SettingsPreferenceFragment root.findPreference(KEY_GENERAL_CATEGORY); if (pm.hasSystemFeature(LIVE_LOCK_SCREEN_FEATURE) && generalCategory != null) { Preference liveLockPreference = new Preference(getContext(), null); - liveLockPreference.setFragment(LiveLockScreenSettings.class.getCanonicalName()); + liveLockPreference.setIntent(new Intent(ACTION_OPEN_LIVE_LOCKSCREEN_SETTINGS)); liveLockPreference.setOrder(0); liveLockPreference.setTitle(R.string.live_lock_screen_title); liveLockPreference.setSummary(R.string.live_lock_screen_summary); diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index d392a0a..692b292 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -126,5 +126,6 @@ public class Settings extends SettingsActivity { public static class ContributorsCloudActivity extends SettingsActivity { /* empty */ } public static class SoundSettingsActivity extends SettingsActivity { /* empty */ } public static class LockScreenSettingsActivity extends SettingsActivity { /* empty */ } + public static class LiveLockScreenSettingsActivity extends SettingsActivity { /* empty */ } public static class NotificationManagerActivity extends SettingsActivity { /* empty */ } } |