summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblack <blackzigong@gmail.com>2014-07-04 15:25:11 (GMT)
committerMichael Bestas <mikeioannina@gmail.com>2014-07-10 10:06:34 (GMT)
commitcc8310caba38e89123c6f2feb25ab8981b2836c6 (patch)
treec6bbf2bd2e22703ed7303b4ecee0f07fda6fb712
parent2168cc82e4c349d62db8476a914d80cd041a7d8c (diff)
downloadandroid_packages_apps_Trebuchet-cc8310caba38e89123c6f2feb25ab8981b2836c6.zip
android_packages_apps_Trebuchet-cc8310caba38e89123c6f2feb25ab8981b2836c6.tar.gz
android_packages_apps_Trebuchet-cc8310caba38e89123c6f2feb25ab8981b2836c6.tar.bz2
Trebuchet: Add a string for JA translation
Change-Id: Ifeac487af7797175863632412b9b82ad8c3acbdb
-rw-r--r--res/values/cm_strings.xml1
-rw-r--r--src/com/android/launcher3/DynamicGridSizeFragment.java5
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index b924922..72bbb4a 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -44,6 +44,7 @@
<string name="grid_size_cozy">Cozy</string>
<string name="grid_size_condensed">Condensed</string>
<string name="grid_size_custom">Custom</string>
+ <string name="grid_size_custom_and_size">Custom (%1$s)</string>
<string name="preferences_interface_homescreen_custom">Select custom size</string>
<string name="preferences_interface_homescreen_rows_title">Number of rows</string>
<string name="preferences_interface_homescreen_columns_title">Number of columns</string>
diff --git a/src/com/android/launcher3/DynamicGridSizeFragment.java b/src/com/android/launcher3/DynamicGridSizeFragment.java
index 586c2bd..490335d 100644
--- a/src/com/android/launcher3/DynamicGridSizeFragment.java
+++ b/src/com/android/launcher3/DynamicGridSizeFragment.java
@@ -313,14 +313,13 @@ public class DynamicGridSizeFragment extends Fragment implements NumberPicker.On
LauncherAppState app = LauncherAppState.getInstance();
DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
- String state = mTitles[position];
int rows = SettingsProvider.getIntCustomDefault(getActivity(),
SettingsProvider.SETTINGS_UI_HOMESCREEN_ROWS, grid.numRowsBase);
int columns = SettingsProvider.getIntCustomDefault(getActivity(),
SettingsProvider.SETTINGS_UI_HOMESCREEN_COLUMNS, grid.numColumnsBase);
- state += " " + "(" + rows + " " + "\u00d7" + " " + columns + ")";
+ String gridSize = rows + " " + "\u00d7" + " " + columns;
- textView.setText(state);
+ textView.setText(getString(R.string.grid_size_custom_and_size, gridSize));
}
convertView.setOnClickListener(mSettingsItemListener);