diff options
| -rw-r--r-- | res/xml/system_extensions.xml | 4 | ||||
| -rw-r--r-- | src/com/aicp/extras/dslv/ActionListViewSettings.java | 8 | ||||
| -rw-r--r-- | src/com/aicp/extras/fragments/SlimRecentAppSidebar.java (renamed from src/com/aicp/extras/fragments/SlimRecentAppSidebar.java.bak) | 0 | ||||
| -rw-r--r-- | src/com/aicp/extras/fragments/SlimRecentAppSidebarStyle.java (renamed from src/com/aicp/extras/fragments/SlimRecentAppSidebarStyle.java.bak) | 0 | ||||
| -rw-r--r-- | src/com/aicp/extras/fragments/SlimRecents.java (renamed from src/com/aicp/extras/fragments/SlimRecents.java.bak) | 0 | ||||
| -rw-r--r-- | src/com/aicp/extras/fragments/SlimRecentsBlacklist.java (renamed from src/com/aicp/extras/fragments/SlimRecentsBlacklist.java.bak) | 0 | ||||
| -rw-r--r-- | src/com/aicp/extras/fragments/SystemExtensions.java | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/res/xml/system_extensions.xml b/res/xml/system_extensions.xml index 45ce21ee6..c4fb025c9 100644 --- a/res/xml/system_extensions.xml +++ b/res/xml/system_extensions.xml @@ -50,12 +50,12 @@ --> <!-- TODO: in case we get more recents settings, use above recents fragment instead again --> - <!-- <com.aicp.extras.preference.SystemSettingMasterSwitchPreference + <com.aicp.extras.preference.SystemSettingMasterSwitchPreference android:key="use_slim_recents" android:title="@string/slim_recents_title" aicpextras:thereCanBeOnlyOneGroupId="1" android:defaultValue="false" - android:fragment="com.aicp.extras.fragments.SlimRecents" /> --> + android:fragment="com.aicp.extras.fragments.SlimRecents" /> <PreferenceCategory android:key="blockers_category" diff --git a/src/com/aicp/extras/dslv/ActionListViewSettings.java b/src/com/aicp/extras/dslv/ActionListViewSettings.java index 05f5db0fe..eb6805062 100644 --- a/src/com/aicp/extras/dslv/ActionListViewSettings.java +++ b/src/com/aicp/extras/dslv/ActionListViewSettings.java @@ -579,11 +579,11 @@ public class ActionListViewSettings extends ListFragment implements mActivity, mActionValuesKey, mActionEntriesKey); case SHAKE_EVENTS_DISABLED: return ActionHelper.getDisabledShakeApps(mActivity); + */ case RECENT_APP_SIDEBAR: return ActionHelper.getRecentAppSidebarConfigWithDescription( mActivity, mActionValuesKey, mActionEntriesKey); - */ } return null; } @@ -612,11 +612,11 @@ public class ActionListViewSettings extends ListFragment implements case SHAKE_EVENTS_DISABLED: ActionHelper.setDisabledShakeApps(mActivity, actionConfigs, reset); break; + */ case RECENT_APP_SIDEBAR: ActionHelper.setRecentAppSidebarConfig(mActivity, actionConfigs, reset); break; - */ } } @@ -680,10 +680,10 @@ public class ActionListViewSettings extends ListFragment implements getItem(position).getClickAction(), iconUri, false), 36); */ } else { - /* d = ImageHelper.resize( + d = ImageHelper.resize( mActivity, ActionHelper.getActionIconImage(mActivity, getItem(position).getClickAction(), - iconUri), 36); */ + iconUri), 36); } if (iconUri != null && iconUri.startsWith(ActionConstants.SYSTEM_ICON_IDENTIFIER)) { diff --git a/src/com/aicp/extras/fragments/SlimRecentAppSidebar.java.bak b/src/com/aicp/extras/fragments/SlimRecentAppSidebar.java index 743876afd..743876afd 100644 --- a/src/com/aicp/extras/fragments/SlimRecentAppSidebar.java.bak +++ b/src/com/aicp/extras/fragments/SlimRecentAppSidebar.java diff --git a/src/com/aicp/extras/fragments/SlimRecentAppSidebarStyle.java.bak b/src/com/aicp/extras/fragments/SlimRecentAppSidebarStyle.java index e74b08f00..e74b08f00 100644 --- a/src/com/aicp/extras/fragments/SlimRecentAppSidebarStyle.java.bak +++ b/src/com/aicp/extras/fragments/SlimRecentAppSidebarStyle.java diff --git a/src/com/aicp/extras/fragments/SlimRecents.java.bak b/src/com/aicp/extras/fragments/SlimRecents.java index 84ed6f257..84ed6f257 100644 --- a/src/com/aicp/extras/fragments/SlimRecents.java.bak +++ b/src/com/aicp/extras/fragments/SlimRecents.java diff --git a/src/com/aicp/extras/fragments/SlimRecentsBlacklist.java.bak b/src/com/aicp/extras/fragments/SlimRecentsBlacklist.java index 6b59c3ef2..6b59c3ef2 100644 --- a/src/com/aicp/extras/fragments/SlimRecentsBlacklist.java.bak +++ b/src/com/aicp/extras/fragments/SlimRecentsBlacklist.java diff --git a/src/com/aicp/extras/fragments/SystemExtensions.java b/src/com/aicp/extras/fragments/SystemExtensions.java index 48c79b9f7..a803a6e19 100644 --- a/src/com/aicp/extras/fragments/SystemExtensions.java +++ b/src/com/aicp/extras/fragments/SystemExtensions.java @@ -50,7 +50,7 @@ import com.aicp.extras.utils.Util; */ findPreference(PREF_ADBLOCK).setOnPreferenceChangeListener(this); - // Util.require3Nav(getActivity(), findPreference(Settings.System.USE_SLIM_RECENTS)); + Util.require3Nav(getActivity(), findPreference(Settings.System.USE_SLIM_RECENTS)); } @Override |
