diff options
author | d34d <clark@cyngn.com> | 2016-03-14 09:57:31 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-03-30 08:48:24 -0700 |
commit | 29b521d5628d1c479d7ec84c8090b0ed4cfa8b0a (patch) | |
tree | b503b3fb37253f24b4ca1e8e457bdc5bcb303c49 /src/com/android/settings/cyanogenmod | |
parent | bac4604893d4e24682e7bc016c362a2793bf1069 (diff) | |
download | packages_apps_Settings-29b521d5628d1c479d7ec84c8090b0ed4cfa8b0a.zip packages_apps_Settings-29b521d5628d1c479d7ec84c8090b0ed4cfa8b0a.tar.gz packages_apps_Settings-29b521d5628d1c479d7ec84c8090b0ed4cfa8b0a.tar.bz2 |
LLS: Use LiveLockScreenManager for selecting LLS
Change-Id: Ib404b4fb1cdbad773703e4702490b92cc14a548e
Diffstat (limited to 'src/com/android/settings/cyanogenmod')
-rw-r--r-- | src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java b/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java index 4ffcc31..800e59c 100644 --- a/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java +++ b/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java @@ -52,9 +52,9 @@ import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; import com.android.settings.widget.SwitchBar; +import cyanogenmod.app.LiveLockScreenManager; import cyanogenmod.externalviews.KeyguardExternalViewProviderService; import cyanogenmod.providers.CMSettings; -import org.cyanogenmod.internal.util.CmLockPatternUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; @@ -316,12 +316,12 @@ public class LiveLockScreenSettings extends SettingsPreferenceFragment implement private final Context mContext; private final LiveLockScreenInfoComparator mComparator; - private CmLockPatternUtils mLockPatternUtils; + private LiveLockScreenManager mLLSM; public LiveLockScreenBackend(Context context) { mContext = context; mComparator = new LiveLockScreenInfoComparator(null); - mLockPatternUtils = new CmLockPatternUtils(context); + mLLSM = LiveLockScreenManager.getInstance(context); } public List<LiveLockScreenInfo> getLiveLockScreenInfos() { @@ -381,26 +381,20 @@ public class LiveLockScreenSettings extends SettingsPreferenceFragment implement } private void setBoolean(String key, boolean value) { - CMSettings.Secure.putInt(mContext.getContentResolver(), key, value ? 1 : 0); + mLLSM.setLiveLockScreenEnabled(value); } public void setActiveLiveLockScreen(ComponentName liveLockScreen) { logd("setActiveLiveLockScreen(%s)", liveLockScreen); - if (mLockPatternUtils == null) { - return; - } - try { - mLockPatternUtils.setThirdPartyKeyguard(liveLockScreen); - } catch (PackageManager.NameNotFoundException e) { - Log.w(TAG, "Failed to set active live lock screen to " + liveLockScreen, e); - } + cyanogenmod.app.LiveLockScreenInfo.Builder builder = + new cyanogenmod.app.LiveLockScreenInfo.Builder(); + builder.setComponent(liveLockScreen); + mLLSM.setDefaultLiveLockScreen(builder.build()); } public ComponentName getActiveLiveLockScreen() { - if (mLockPatternUtils == null) { - return null; - } - return mLockPatternUtils.getThirdPartyKeyguardComponent(); + cyanogenmod.app.LiveLockScreenInfo llsInfo = mLLSM.getDefaultLiveLockScreen(); + return llsInfo != null ? llsInfo.component : null; } public void launchSettings(LiveLockScreenInfo liveLockScreenInfo) { |