diff options
| author | Clark Scheff <clark@cyngn.com> | 2014-07-16 17:44:00 -0700 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2014-07-17 16:19:32 +0000 |
| commit | ab323cff22ec09cba01c8a0735c6d590ca334272 (patch) | |
| tree | 8529d6df8610ba72cf33e64e203c69e497c87d75 /src/org | |
| parent | a61849e1e1f909a4fb4cec0c2e6746f9c0a53e41 (diff) | |
| download | packages_apps_ThemeChooser-ab323cff22ec09cba01c8a0735c6d590ca334272.zip packages_apps_ThemeChooser-ab323cff22ec09cba01c8a0735c6d590ca334272.tar.gz packages_apps_ThemeChooser-ab323cff22ec09cba01c8a0735c6d590ca334272.tar.bz2 | |
Retrieve navbar_background if it exists.
Change-Id: Iab958d7ae4ebfe5217ce0bcee56c207cbc0a2b74
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java b/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java index b53f875..75b2025 100644 --- a/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java +++ b/src/org/cyanogenmod/theme/chooserv2/ThemeFragment.java @@ -87,6 +87,8 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb public static final int ANIMATE_PROGRESS_OUT_DURATION = 400; public static final int ANIMATE_TITLE_IN_DURATION = 500; + private static final String NAVIGATION_BAR_BACKGROUND = "navbar_background"; + public static final String CURRENTLY_APPLIED_THEME = "currently_applied_theme"; private static final ComponentName COMPONENT_DIALER = @@ -663,7 +665,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb PreviewColumns.ICON_PREVIEW_4, // TODO: add this to the ThemesContract if this // design moves beyond prototype - "navbar_background" + NAVIGATION_BAR_BACKGROUND }; uri = PreviewColumns.APPLIED_URI; selection = null; @@ -883,7 +885,10 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb int backButtonIdx = c.getColumnIndex(PreviewColumns.NAVBAR_BACK_BUTTON); int homeButtonIdx = c.getColumnIndex(PreviewColumns.NAVBAR_HOME_BUTTON); int recentButtonIdx = c.getColumnIndex(PreviewColumns.NAVBAR_RECENT_BUTTON); - int backgroundIdx = c.getColumnIndex(PreviewColumns.STATUSBAR_BACKGROUND); + int backgroundIdx = c.getColumnIndex(NAVIGATION_BAR_BACKGROUND); + if (backgroundIdx == -1) { + backgroundIdx = c.getColumnIndex(PreviewColumns.STATUSBAR_BACKGROUND); + } int pkgNameIdx = c.getColumnIndex(ThemesColumns.PKG_NAME); Bitmap background = Utils.loadBitmapBlob(c, backgroundIdx); |