diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-02 15:06:12 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-09-02 22:15:29 +0000 |
commit | f4f89ef608245d39bbddda05f291361d2ae06667 (patch) | |
tree | e829f08f3e4fb42fbf88e8515f92272f0ef1af8a /src/com/android | |
parent | 9e0702f4af33db569c9ed79bdf311204abe40dd5 (diff) | |
download | android_packages_apps_Trebuchet-f4f89ef608245d39bbddda05f291361d2ae06667.tar.gz android_packages_apps_Trebuchet-f4f89ef608245d39bbddda05f291361d2ae06667.tar.bz2 android_packages_apps_Trebuchet-f4f89ef608245d39bbddda05f291361d2ae06667.zip |
Using context.getString for getting formatted strings, as it works better with different locales
Change-Id: I9639bb11197e656c5cdd3a4d63f913edcc0987cb
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/FolderIcon.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/FolderPagedView.java | 3 | ||||
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 5 |
6 files changed, 8 insertions, 12 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 53fab11f9..1a3876dc4 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -319,7 +319,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList if (commit) { sendCustomAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED, - String.format(getContext().getString(R.string.folder_renamed), newTitle)); + getContext().getString(R.string.folder_renamed, newTitle)); } // In order to clear the focus from the text field, we set the focus on ourself. This // ensures that every time the field is clicked, focus is gained, giving reliable behavior. diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index c6b2f35c4..bd61a6de5 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -173,8 +173,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { icon.setOnClickListener(launcher); icon.mInfo = folderInfo; icon.mLauncher = launcher; - icon.setContentDescription(String.format(launcher.getString(R.string.folder_name_format), - folderInfo.title)); + icon.setContentDescription(launcher.getString(R.string.folder_name_format, folderInfo.title)); Folder folder = Folder.fromXml(launcher); folder.setDragController(launcher.getDragController()); folder.setFolderIcon(icon); @@ -714,8 +713,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { public void onTitleChanged(CharSequence title) { mFolderName.setText(title); - setContentDescription(String.format(getContext().getString(R.string.folder_name_format), - title)); + setContentDescription(getContext().getString(R.string.folder_name_format, title)); } @Override diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java index d8ef34e1c..7aff8322e 100644 --- a/src/com/android/launcher3/FolderPagedView.java +++ b/src/com/android/launcher3/FolderPagedView.java @@ -436,8 +436,7 @@ public class FolderPagedView extends PagedView { } public String getAccessibilityDescription() { - return String.format(getContext().getString(R.string.folder_opened), - mGridCountX, mGridCountY); + return getContext().getString(R.string.folder_opened, mGridCountX, mGridCountY); } /** diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 28e336764..5d2e1ccc4 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -2300,7 +2300,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } protected String getCurrentPageDescription() { - return String.format(getContext().getString(R.string.default_scroll_format), + return getContext().getString(R.string.default_scroll_format, getNextPage() + 1, getChildCount()); } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index e742ea00f..7b1ee4740 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -4382,7 +4382,7 @@ public class Workspace extends PagedView private String getPageDescription(int page) { int delta = numCustomPages(); - return String.format(getContext().getString(R.string.workspace_scroll_format), + return getContext().getString(R.string.workspace_scroll_format, page + 1 - delta, getChildCount() - delta); } diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index f28d38434..f885567ac 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -414,11 +414,10 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. */ public void setLastSearchQuery(String query) { Resources res = mLauncher.getResources(); - String formatStr = res.getString(R.string.all_apps_no_search_results); mLastSearchQuery = query; - mEmptySearchMessage = String.format(formatStr, query); + mEmptySearchMessage = res.getString(R.string.all_apps_no_search_results, query); if (mMarketAppName != null) { - mMarketSearchMessage = String.format(res.getString(R.string.all_apps_search_market_message), + mMarketSearchMessage = res.getString(R.string.all_apps_search_market_message, mMarketAppName); mMarketSearchIntent = createMarketSearchIntent(query); } |