summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClark Scheff <clark@cyngn.com>2014-05-16 08:54:45 -0700
committerClark Scheff <clark@cyngn.com>2014-05-16 08:54:45 -0700
commitabf8ea82b4a80f949389acb58871d77bee4c730d (patch)
treeb05a5dc2e1eb3744bea841f5d82cbe76b8babe9f
parent2fe8ad908fe5c5ea99c1fee9a3285676f84be73e (diff)
downloadpackages_apps_ThemeChooser-abf8ea82b4a80f949389acb58871d77bee4c730d.zip
packages_apps_ThemeChooser-abf8ea82b4a80f949389acb58871d77bee4c730d.tar.gz
packages_apps_ThemeChooser-abf8ea82b4a80f949389acb58871d77bee4c730d.tar.bz2
If default theme, get localized title string
Change-Id: I2f09c3eb725da16cf7eed681b5527655172e5009
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/org/cyanogenmod/theme/chooser/ChooserBrowseFragment.java13
-rw-r--r--src/org/cyanogenmod/theme/chooser/ChooserDetailFragment.java3
3 files changed, 13 insertions, 5 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 481b4c9..4cdb267 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -29,6 +29,8 @@
<string name="alarms">Alarms</string>
<string name="style">Style</string>
+ <string name="holo_default">Holo (Default)</string>
+
<string name="apply">Apply</string>
<string name="applying">Applying</string>
<string name="remove">Remove</string>
diff --git a/src/org/cyanogenmod/theme/chooser/ChooserBrowseFragment.java b/src/org/cyanogenmod/theme/chooser/ChooserBrowseFragment.java
index 8450a6b..82ecd87 100644
--- a/src/org/cyanogenmod/theme/chooser/ChooserBrowseFragment.java
+++ b/src/org/cyanogenmod/theme/chooser/ChooserBrowseFragment.java
@@ -60,6 +60,8 @@ import android.widget.ListView;
import android.widget.TextView;
public class ChooserBrowseFragment extends Fragment implements LoaderManager.LoaderCallbacks<Cursor> {
+ public static final String DEFAULT = "default";
+
public ListView mListView;
public LocalPagerAdapter mAdapter;
public ArrayList<String> mComponentFilters;
@@ -142,10 +144,12 @@ public class ChooserBrowseFragment extends Fragment implements LoaderManager.Loa
public class LocalPagerAdapter extends CursorAdapter {
List<String> mFilters;
+ Context mContext;
public LocalPagerAdapter(Context context, Cursor c, List<String> filters) {
super(context, c, 0);
mFilters = filters;
+ mContext = context;
}
@Override
@@ -166,10 +170,11 @@ public class ChooserBrowseFragment extends Fragment implements LoaderManager.Loa
int pkgIdx = mCursor.getColumnIndex(ThemesColumns.PKG_NAME);
int legacyIndex = mCursor.getColumnIndex(ThemesColumns.IS_LEGACY_THEME);
- String title = mCursor.getString(titleIdx);
- String author = mCursor.getString(authorIdx);
String pkgName = mCursor.getString(pkgIdx);
- String hsImagePath = "default".equals(pkgName) ? mCursor.getString(hsIdx) :
+ String title = DEFAULT.equals(pkgName) ? mContext.getString(R.string.holo_default)
+ : mCursor.getString(titleIdx);
+ String author = mCursor.getString(authorIdx);
+ String hsImagePath = DEFAULT.equals(pkgName) ? mCursor.getString(hsIdx) :
mCursor.getString(wpIdx);
String styleImagePath = mCursor.getString(styleIdx);
boolean isLegacyTheme = mCursor.getInt(legacyIndex) == 1;
@@ -331,7 +336,7 @@ public class ChooserBrowseFragment extends Fragment implements LoaderManager.Loa
protected Bitmap doInBackground(Object... params) {
Bitmap bitmap = null;
if (!isLegacyTheme) {
- if ("default".equals(pkgName)) {
+ if (DEFAULT.equals(pkgName)) {
Resources res = getActivity().getResources();
AssetManager assets = new AssetManager();
assets.addAssetPath(WallpaperAndIconPreviewFragment.FRAMEWORK_RES);
diff --git a/src/org/cyanogenmod/theme/chooser/ChooserDetailFragment.java b/src/org/cyanogenmod/theme/chooser/ChooserDetailFragment.java
index 1f860c0..d32f49c 100644
--- a/src/org/cyanogenmod/theme/chooser/ChooserDetailFragment.java
+++ b/src/org/cyanogenmod/theme/chooser/ChooserDetailFragment.java
@@ -333,7 +333,8 @@ public class ChooserDetailFragment extends Fragment implements LoaderManager.Loa
int lockIdx = cursor.getColumnIndex(ThemesColumns.LOCKSCREEN_URI);
boolean isLegacyTheme = cursor.getInt(legacyIdx) == 1;
- String title = cursor.getString(titleIdx);
+ String title = ChooserBrowseFragment.DEFAULT.equals(mPkgName)
+ ? getActivity().getString(R.string.holo_default) : cursor.getString(titleIdx);
String author = cursor.getString(authorIdx);
String hsImagePath = isLegacyTheme ? mPkgName : cursor.getString(hsIdx);
String styleImagePath = cursor.getString(styleIdx);