From 38971be4230e2b33daf15be37822f70f81dfe81c Mon Sep 17 00:00:00 2001 From: black Date: Mon, 10 Nov 2014 10:35:00 -0800 Subject: Trebuchet: Change multiplication sign Change-Id: I3f91cb651af53f5d2a4005477011b7a48e4a46e7 --- src/com/android/launcher3/DynamicGridSizeFragment.java | 6 +++--- src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher3/DynamicGridSizeFragment.java b/src/com/android/launcher3/DynamicGridSizeFragment.java index 2fda39f2a..586c2bd49 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 202df1727..e4ba5da7a 100644 --- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java +++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java @@ -192,12 +192,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); -- cgit v1.2.3