summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblack <blackzigong@gmail.com>2014-06-26 11:49:11 (GMT)
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2014-06-30 21:23:31 (GMT)
commit5fabfae2b58c7cba517475f2d4465f6d3c4eeb63 (patch)
treed11a05aeec6838ccc87824b4aa1847b0ac5c8d78
parent26d601e5f7b779fc9a2cec7ec4aa74799a8938e4 (diff)
downloadandroid_packages_apps_Trebuchet-5fabfae2b58c7cba517475f2d4465f6d3c4eeb63.zip
android_packages_apps_Trebuchet-5fabfae2b58c7cba517475f2d4465f6d3c4eeb63.tar.gz
android_packages_apps_Trebuchet-5fabfae2b58c7cba517475f2d4465f6d3c4eeb63.tar.bz2
Trebuchet: Change multiplication sign
Change-Id: I3f91cb651af53f5d2a4005477011b7a48e4a46e7
-rw-r--r--src/com/android/launcher3/DynamicGridSizeFragment.java6
-rw-r--r--src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java3
2 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/launcher3/DynamicGridSizeFragment.java b/src/com/android/launcher3/DynamicGridSizeFragment.java
index 2fda39f..586c2bd 100644
--- a/src/com/android/launcher3/DynamicGridSizeFragment.java
+++ b/src/com/android/launcher3/DynamicGridSizeFragment.java
@@ -135,7 +135,7 @@ public class DynamicGridSizeFragment extends Fragment implements NumberPicker.On
int rows = mCustomGridRows == 0 ? (int) grid.numRows : mCustomGridRows;
int columns = mCustomGridColumns == 0 ? (int) grid.numColumns : mCustomGridColumns;
- String text = rows + " x " + columns;
+ String text = rows + " " + "\u00d7" + " " + columns;
Bitmap bm = BitmapFactory.decodeResource(getResources(),
drawableId).copy(Bitmap.Config.ARGB_8888, true);
@@ -318,7 +318,7 @@ public class DynamicGridSizeFragment extends Fragment implements NumberPicker.On
SettingsProvider.SETTINGS_UI_HOMESCREEN_ROWS, grid.numRowsBase);
int columns = SettingsProvider.getIntCustomDefault(getActivity(),
SettingsProvider.SETTINGS_UI_HOMESCREEN_COLUMNS, grid.numColumnsBase);
- state += "(" + rows + "x" + columns + ")";
+ state += " " + "(" + rows + " " + "\u00d7" + " " + columns + ")";
textView.setText(state);
}
@@ -328,4 +328,4 @@ public class DynamicGridSizeFragment extends Fragment implements NumberPicker.On
return convertView;
}
}
-} \ No newline at end of file
+}
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
index dd1dc3b..805b51e 100644
--- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
+++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java
@@ -203,12 +203,11 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter {
state = mLauncher.getResources().getString(R.string.grid_size_condensed);
break;
case Custom:
- state = mLauncher.getResources().getString(R.string.grid_size_custom);
int rows = SettingsProvider.getIntCustomDefault(mLauncher,
SettingsProvider.SETTINGS_UI_HOMESCREEN_ROWS, 0);
int columns = SettingsProvider.getIntCustomDefault(mLauncher,
SettingsProvider.SETTINGS_UI_HOMESCREEN_COLUMNS, 0);
- state += "(" + rows + "x" + columns + ")";
+ state = rows + " " + "\u00d7" + " " + columns;
break;
}
((TextView) v.findViewById(R.id.item_state)).setText(state);