diff options
| author | Luis Vidal <lvidal@cyngn.com> | 2015-12-23 22:17:38 -0600 |
|---|---|---|
| committer | Luis Vidal <lvidal@cyngn.com> | 2016-01-08 11:32:32 -0800 |
| commit | ffd1eaea0b78df32f0bf7d4e4c691dd3dd57290e (patch) | |
| tree | a5a9d8fab58757b2926d08a4b8c3678c6499e18a /src/com/cyngn/theme/chooser/ChooserActivity.java | |
| parent | 98a98fca3ed0249f00d9d28e2997f4d240e813e4 (diff) | |
| download | packages_apps_ThemeChooser-ffd1eaea0b78df32f0bf7d4e4c691dd3dd57290e.zip packages_apps_ThemeChooser-ffd1eaea0b78df32f0bf7d4e4c691dd3dd57290e.tar.gz packages_apps_ThemeChooser-ffd1eaea0b78df32f0bf7d4e4c691dd3dd57290e.tar.bz2 | |
Show lock screen wallpapers & live lock screens in the same selector
Change-Id: I86e016d139da4adcec3191d982968b7a37f48c19
Diffstat (limited to 'src/com/cyngn/theme/chooser/ChooserActivity.java')
| -rw-r--r-- | src/com/cyngn/theme/chooser/ChooserActivity.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/cyngn/theme/chooser/ChooserActivity.java b/src/com/cyngn/theme/chooser/ChooserActivity.java index b395ecc..78a583f 100644 --- a/src/com/cyngn/theme/chooser/ChooserActivity.java +++ b/src/com/cyngn/theme/chooser/ChooserActivity.java @@ -65,7 +65,6 @@ import java.util.Map; import static android.provider.ThemesContract.ThemesColumns.MODIFIES_ALARMS; import static android.provider.ThemesContract.ThemesColumns.MODIFIES_BOOT_ANIM; -import static android.provider.ThemesContract.ThemesColumns.MODIFIES_LIVE_LOCK_SCREEN; import static android.provider.ThemesContract.ThemesColumns.MODIFIES_NOTIFICATIONS; import static android.provider.ThemesContract.ThemesColumns.MODIFIES_RINGTONES; @@ -507,7 +506,7 @@ public class ChooserActivity extends FragmentActivity final Resources res = getResources(); int itemsPerPage = res.getInteger(R.integer.default_items_per_page); int height = res.getDimensionPixelSize(R.dimen.component_selection_cell_height); - if (MODIFIES_BOOT_ANIM.equals(component) || MODIFIES_LIVE_LOCK_SCREEN.equals(component)) { + if (MODIFIES_BOOT_ANIM.equals(component)) { itemsPerPage = res.getInteger(R.integer.bootani_items_per_page); height = res.getDimensionPixelSize( R.dimen.component_selection_cell_height_boot_anim); @@ -792,6 +791,12 @@ public class ChooserActivity extends FragmentActivity String component = ThemesContract.MixnMatchColumns.mixNMatchKeyToComponent(mixkey); String pkg = c.getString(pkgIdx); mCurrentTheme.put(component, pkg); + if (TextUtils.equals(component, ThemesColumns.MODIFIES_LIVE_LOCK_SCREEN)) { + mCurrentTheme.remove(ThemesColumns.MODIFIES_LOCKSCREEN); + } + if (TextUtils.equals(component, ThemesColumns.MODIFIES_LOCKSCREEN)) { + mCurrentTheme.remove(ThemesColumns.MODIFIES_LIVE_LOCK_SCREEN); + } if (cmpntIdIdx >= 0 && TextUtils.equals(component, ThemesColumns.MODIFIES_LAUNCHER)) { mCurrentWallpaperCmpntId.value = c.getLong(cmpntIdIdx); } |