From 8c65e15e74135f93580d8d67d08de4332e6d03a6 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Thu, 5 Nov 2015 16:41:06 -0800 Subject: [PATCH] cmsdk: Finish migrating "last app" logic to cmsdk. Change-Id: I94dbd41639c734f53000b975685bf42d046a7e84 --- .../cyanogenmod/cmsettings/CMSettingsProvider.java | 14 +++++++++++++- src/java/cyanogenmod/content/Intent.java | 12 +++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java index ff0173c..5684fdf 100644 --- a/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java +++ b/packages/CMSettingsProvider/src/org/cyanogenmod/cmsettings/CMSettingsProvider.java @@ -158,7 +158,7 @@ public class CMSettingsProvider extends ContentProvider { } /* @hide */ - private static class LegacyCMSettings { + static class LegacyCMSettings { /** * Whether to allow one finger quick settings expansion on the right side of the statusbar. * @deprecated Use {@link android.provider.Settings.System#QS_QUICK_PULLDOWN} instead @@ -274,6 +274,15 @@ public class CMSettingsProvider extends ContentProvider { * 'com.google.vending' -> 'com.white.theme' */ public static final String THEME_PKG_CONFIGURATION_PERSISTENCE_PROPERTY = "themeConfig"; + + /** + * The global recents long press activity chosen by the user. + * This setting is stored as a flattened component name as + * per {@link ComponentName#flattenToString()}. + * + * @hide + */ + public static final String RECENTS_LONG_PRESS_ACTIVITY = "recents_long_press_activity"; } /** @@ -335,6 +344,9 @@ public class CMSettingsProvider extends ContentProvider { CMSettings.Secure.NAVIGATION_RING_TARGETS[i]); } + secureToCmSettingsMap.put(LegacyCMSettings.RECENTS_LONG_PRESS_ACTIVITY, + CMSettings.Secure.RECENTS_LONG_PRESS_ACTIVITY); + rowsMigrated = migrateCMSettingsForTable(userId, CMDatabaseHelper.CMTableNames.TABLE_SECURE, secureToCmSettingsMap); if (LOCAL_LOGV) Log.d(TAG, "Migrated " + rowsMigrated + " to CM secure table"); diff --git a/src/java/cyanogenmod/content/Intent.java b/src/java/cyanogenmod/content/Intent.java index 98efcd6..b7ae458 100644 --- a/src/java/cyanogenmod/content/Intent.java +++ b/src/java/cyanogenmod/content/Intent.java @@ -29,5 +29,15 @@ public class Intent { *

Output: Nothing * @hide */ - public static final String ACTION_RECENTS_LONG_PRESS = "android.intent.action.RECENTS_LONG_PRESS"; + public static final String ACTION_RECENTS_LONG_PRESS = + "cyanogenmod.intent.action.RECENTS_LONG_PRESS"; + + /** + * This field is part of the intent {@link #ACTION_RECENTS_LONG_PRESS}. + * The type of the extra is a boolean that indicates if the long press + * is released. + * @hide + */ + public static final String EXTRA_RECENTS_LONG_PRESS_RELEASE = + "cyanogenmod.intent.extra.RECENTS_LONG_PRESS_RELEASE"; }