diff options
| -rw-r--r-- | src/com/cyngn/theme/chooser/ComponentSelector.java | 3 | ||||
| -rw-r--r-- | src/com/cyngn/theme/chooser/ThemeFragment.java | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/com/cyngn/theme/chooser/ComponentSelector.java b/src/com/cyngn/theme/chooser/ComponentSelector.java index dcf049a..5c59b31 100644 --- a/src/com/cyngn/theme/chooser/ComponentSelector.java +++ b/src/com/cyngn/theme/chooser/ComponentSelector.java @@ -427,6 +427,9 @@ public class ComponentSelector extends LinearLayout data.moveToPosition(indx); lockScreenMatrixCursor.addRow(CursorLoaderHelper.getRowFromCursor(data)); } + if (needToSplitRowAt == 0) { + data.moveToPosition(-1); + } while (data.moveToNext()) { lockWallPaperThumbnail = data.getString(lockWallPaperThumbnailIndx); liveLockScreenThumbnail = data.getString(llsThumbnailIndx); diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/com/cyngn/theme/chooser/ThemeFragment.java index 45a469a..0b7de62 100644 --- a/src/com/cyngn/theme/chooser/ThemeFragment.java +++ b/src/com/cyngn/theme/chooser/ThemeFragment.java @@ -1959,8 +1959,12 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb // Only pass on mSelectedWallpaperComponentId if dealing with mods_launcher long selectedComponentId = (ThemesColumns.MODIFIES_LAUNCHER.equals(component)) ? mSelectedWallpaperComponentId : DEFAULT_COMPONENT_ID; - getChooserActivity().showComponentSelector(component, - mSelectedComponentsMap.get(component), selectedComponentId, v); + String pkgName = mSelectedComponentsMap.get(component); + if (component.equals(MODIFIES_LOCKSCREEN) + && mSelectedComponentsMap.containsKey(MODIFIES_LIVE_LOCK_SCREEN)) { + pkgName = mSelectedComponentsMap.get(MODIFIES_LIVE_LOCK_SCREEN); + } + getChooserActivity().showComponentSelector(component, pkgName, selectedComponentId, v); fadeOutNonSelectedCards(mActiveCardId); stopMediaPlayers(); } |