OSDN Git Service
(root)
/
android-x86
/
packages-apps-Launcher3.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d43808
)
Fixing string.format missed in previous conflict resolution
author
Sunny Goyal
<sunnygoyal@google.com>
Fri, 25 Sep 2015 18:58:59 +0000
(11:58 -0700)
committer
Sunny Goyal
<sunnygoyal@google.com>
Fri, 25 Sep 2015 19:07:40 +0000
(12:07 -0700)
Change-Id: Ic71ee97c319bb9141f70acf75f2fe0e40565f692
src/com/android/launcher3/Workspace.java
patch
|
blob
|
history
diff --git
a/src/com/android/launcher3/Workspace.java
b/src/com/android/launcher3/Workspace.java
index
5e05224
..
4a85a48
100644
(file)
--- a/
src/com/android/launcher3/Workspace.java
+++ b/
src/com/android/launcher3/Workspace.java
@@
-4404,7
+4404,7
@@
public class Workspace extends PagedView
}
nScreens--;
}
- return
String.format(getContext().getString(R.string.workspace_scroll_format)
,
+ return
getContext().getString(R.string.workspace_scroll_format
,
page + 1 - delta, nScreens);
}