commit | c5c723bbe43206ffa218b677984bc56a877359c4 | [log] [tgz] |
---|---|---|
author | Sunny Goyal <sunnygoyal@google.com> | Fri Sep 25 11:58:59 2015 -0700 |
committer | Sunny Goyal <sunnygoyal@google.com> | Fri Sep 25 12:07:40 2015 -0700 |
tree | cff63680378986012575f77a1eb7298f8f911545 | |
parent | 9d4380856ff41ecb26c0d5aee1747b6060d2ef0e [diff] |
Fixing string.format missed in previous conflict resolution Change-Id: Ic71ee97c319bb9141f70acf75f2fe0e40565f692
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 5e05224..4a85a48 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java
@@ -4404,7 +4404,7 @@ } nScreens--; } - return String.format(getContext().getString(R.string.workspace_scroll_format), + return getContext().getString(R.string.workspace_scroll_format, page + 1 - delta, nScreens); }