diff options
Diffstat (limited to 'src/com/cyngn/theme/chooser')
6 files changed, 11 insertions, 19 deletions
diff --git a/src/com/cyngn/theme/chooser/AppReceiver.java b/src/com/cyngn/theme/chooser/AppReceiver.java index 920dc4d..4edb41b 100644 --- a/src/com/cyngn/theme/chooser/AppReceiver.java +++ b/src/com/cyngn/theme/chooser/AppReceiver.java @@ -74,14 +74,8 @@ public class AppReceiver extends BroadcastReceiver { private boolean isTheme(Context context, String pkgName) throws NameNotFoundException { PackageInfo pi = context.getPackageManager().getPackageInfo(pkgName, 0); - if (pi == null) return false; - if ((pi.themeInfos != null && pi.themeInfos.length > 0) || - (pi.legacyThemeInfos != null && pi.legacyThemeInfos.length > 0)) { - return true; - } - - return false; + return pi != null && pi.themeInfo != null; } private boolean isThemeBeingProcessed(Context context, String pkgName) { diff --git a/src/com/cyngn/theme/chooser/ChooserActivity.java b/src/com/cyngn/theme/chooser/ChooserActivity.java index d8a5f89..5158230 100644 --- a/src/com/cyngn/theme/chooser/ChooserActivity.java +++ b/src/com/cyngn/theme/chooser/ChooserActivity.java @@ -70,7 +70,7 @@ public class ChooserActivity extends FragmentActivity public static final String THEME_STORE_PACKAGE = "com.cyngn.themestore"; private static final String TAG = ChooserActivity.class.getSimpleName(); - public static final String DEFAULT = ThemeConfig.HOLO_DEFAULT; + public static final String DEFAULT = ThemeConfig.SYSTEM_DEFAULT; public static final String EXTRA_PKGNAME = "pkgName"; public static final String EXTRA_COMPONENTS = "components"; diff --git a/src/com/cyngn/theme/chooser/ComponentSelector.java b/src/com/cyngn/theme/chooser/ComponentSelector.java index 1cfe364..27ff13e 100644 --- a/src/com/cyngn/theme/chooser/ComponentSelector.java +++ b/src/com/cyngn/theme/chooser/ComponentSelector.java @@ -114,8 +114,7 @@ public class ComponentSelector extends LinearLayout mContext = context; mInflater = LayoutInflater.from(context); - mBatteryStyle = Settings.System.getInt(context.getContentResolver(), - Settings.System.STATUS_BAR_BATTERY, 0); + mBatteryStyle = 0; mAnimateIn = AnimationUtils.loadAnimation(mContext, R.anim.component_selection_animate_in); diff --git a/src/com/cyngn/theme/chooser/MyThemeFragment.java b/src/com/cyngn/theme/chooser/MyThemeFragment.java index 3ccb8d2..14aca3b 100644 --- a/src/com/cyngn/theme/chooser/MyThemeFragment.java +++ b/src/com/cyngn/theme/chooser/MyThemeFragment.java @@ -35,6 +35,7 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; +import com.cyngn.theme.chooser.ThemeFragment; import com.cyngn.theme.util.AudioUtils; import com.cyngn.theme.util.PreferenceUtils; import com.cyngn.theme.util.ThemedTypefaceHelper; @@ -388,7 +389,7 @@ public class MyThemeFragment extends ThemeFragment { String currentPkg = mCurrentTheme.get(component); String selectedPkg = mSelectedComponentsMap.get(component); if (selectedPkg != null && !currentPkg.equals(selectedPkg)) { - componentsToApply.put(component, selectedPkg); + componentsToApply.put(selectedPkg, component); } } return componentsToApply; diff --git a/src/com/cyngn/theme/chooser/NotificationHijackingService.java b/src/com/cyngn/theme/chooser/NotificationHijackingService.java index a83f2e8..ca53791 100644 --- a/src/com/cyngn/theme/chooser/NotificationHijackingService.java +++ b/src/com/cyngn/theme/chooser/NotificationHijackingService.java @@ -34,8 +34,7 @@ public class NotificationHijackingService extends NotificationListenerService { try { PackageInfo pi = getPackageManager().getPackageInfo(pkgName, 0); if (pi != null) { - if ((pi.themeInfos != null && pi.themeInfos.length > 0) || - (pi.legacyThemeInfos != null && pi.legacyThemeInfos.length > 0)) { + if (pi.themeInfo != null) { cancelNotification(GOOGLE_PLAY_PACKAGE_NAME, sbn.getTag(), sbn.getId()); } } diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/com/cyngn/theme/chooser/ThemeFragment.java index ea33a8c..bd18370 100644 --- a/src/com/cyngn/theme/chooser/ThemeFragment.java +++ b/src/com/cyngn/theme/chooser/ThemeFragment.java @@ -294,8 +294,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb final Context context = getActivity(); mPkgName = getArguments().getString(ARG_PACKAGE_NAME); mSkipLoadingAnim = getArguments().getBoolean(ARG_SKIP_LOADING_ANIM); - mBatteryStyle = Settings.System.getInt(context.getContentResolver(), - Settings.System.STATUS_BAR_BATTERY, 0); + mBatteryStyle = 0; getIconComponents(context); if (sTypefaceHelperCache == null) { @@ -390,7 +389,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb Menu menu = popupmenu.getMenu(); if (CURRENTLY_APPLIED_THEME.equals(mPkgName) || mPkgName.equals(ThemeUtils.getDefaultThemePackageName(getActivity())) || - mPkgName.equals(ThemeConfig.HOLO_DEFAULT)) { + mPkgName.equals(ThemeConfig.SYSTEM_DEFAULT)) { menu.findItem(R.id.menu_delete).setEnabled(false); } if (!mThemeTagLayout.isCustomizedTagEnabled()) { @@ -423,7 +422,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb } }); if (ThemeUtils.getDefaultThemePackageName(getActivity()).equals(mPkgName) || - ThemeConfig.HOLO_DEFAULT.equals(mPkgName)) { + ThemeConfig.SYSTEM_DEFAULT.equals(mPkgName)) { mDelete.setVisibility(View.GONE); } @@ -1000,7 +999,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb Point p = new Point(); display.getSize(p); int heightId = getResources() - .getIdentifier("system_bar_height", "dimen", "android"); + .getIdentifier("navigation_bar_height", "dimen", "android"); int navbar_height = getResources().getDimensionPixelSize(heightId); int[] pos = new int[2]; v.getLocationInWindow(pos); @@ -2606,7 +2605,7 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb return Boolean.FALSE; } ZipFile zip = null; - if (ThemeConfig.HOLO_DEFAULT.equals(mPkgName)) { + if (ThemeConfig.SYSTEM_DEFAULT.equals(mPkgName)) { try { zip = new ZipFile(new File(BootAnimationHelper.SYSTEM_BOOT_ANI_PATH)); } catch (Exception e) { |