diff options
author | Winson Chung <winsonc@google.com> | 2015-06-01 18:27:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 18:27:21 +0000 |
commit | d6850edf87c34134fa3a4c6145e221d7dc0f9d70 (patch) | |
tree | d685210ec29e4a10cca232b41d372b42d1810a47 | |
parent | d3d8c958a28aee7815fa2bc81b5c0b79903d51ad (diff) | |
parent | 595395d84f0507a1c5c163ad4722fa4345376079 (diff) | |
download | android_packages_apps_Trebuchet-d6850edf87c34134fa3a4c6145e221d7dc0f9d70.tar.gz android_packages_apps_Trebuchet-d6850edf87c34134fa3a4c6145e221d7dc0f9d70.tar.bz2 android_packages_apps_Trebuchet-d6850edf87c34134fa3a4c6145e221d7dc0f9d70.zip |
Merge "Avoid merging sections across scripts." into ub-launcher3-burnaby
-rw-r--r-- | src/com/android/launcher3/allapps/AlphabeticalAppsList.java | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java index 3d1503d46..4ab016f76 100644 --- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java +++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java @@ -10,6 +10,8 @@ import com.android.launcher3.Launcher; import com.android.launcher3.compat.AlphabeticIndexCompat; import com.android.launcher3.model.AppNameComparator; +import java.nio.charset.CharsetEncoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -130,7 +132,8 @@ public class AlphabeticalAppsList { * Common interface for different merging strategies. */ private interface MergeAlgorithm { - boolean continueMerging(int sectionAppCount, int numAppsPerRow, int mergeCount); + boolean continueMerging(SectionInfo section, SectionInfo withSection, + int sectionAppCount, int numAppsPerRow, int mergeCount); } /** @@ -139,7 +142,8 @@ public class AlphabeticalAppsList { private static class TabletMergeAlgorithm implements MergeAlgorithm { @Override - public boolean continueMerging(int sectionAppCount, int numAppsPerRow, int mergeCount) { + public boolean continueMerging(SectionInfo section, SectionInfo withSection, + int sectionAppCount, int numAppsPerRow, int mergeCount) { // Merge EVERYTHING return true; } @@ -153,23 +157,34 @@ public class AlphabeticalAppsList { private int mMinAppsPerRow; private int mMinRowsInMergedSection; private int mMaxAllowableMerges; + private CharsetEncoder mAsciiEncoder; public PhoneMergeAlgorithm(int minAppsPerRow, int minRowsInMergedSection, int maxNumMerges) { mMinAppsPerRow = minAppsPerRow; mMinRowsInMergedSection = minRowsInMergedSection; mMaxAllowableMerges = maxNumMerges; + mAsciiEncoder = StandardCharsets.US_ASCII.newEncoder(); } @Override - public boolean continueMerging(int sectionAppCount, int numAppsPerRow, int mergeCount) { + public boolean continueMerging(SectionInfo section, SectionInfo withSection, + int sectionAppCount, int numAppsPerRow, int mergeCount) { // Continue merging if the number of hanging apps on the final row is less than some // fixed number (ragged), the merged rows has yet to exceed some minimum row count, // and while the number of merged sections is less than some fixed number of merges int rows = sectionAppCount / numAppsPerRow; int cols = sectionAppCount % numAppsPerRow; + // Ensure that we do not merge across scripts, currently we only allow for english and + // native scripts so we can test if both can just be ascii encoded + boolean isCrossScript = false; + if (section.firstAppItem != null && withSection.firstAppItem != null) { + isCrossScript = mAsciiEncoder.canEncode(section.firstAppItem.sectionName) != + mAsciiEncoder.canEncode(withSection.firstAppItem.sectionName); + } return (0 < cols && cols < mMinAppsPerRow) && rows < mMinRowsInMergedSection && - mergeCount < mMaxAllowableMerges; + mergeCount < mMaxAllowableMerges && + !isCrossScript; } } @@ -527,8 +542,8 @@ public class AlphabeticalAppsList { int mergeCount = 1; // Merge rows based on the current strategy - while (mMergeAlgorithm.continueMerging(sectionAppCount, mNumAppsPerRow, mergeCount) && - (i + 1) < mSections.size()) { + while (mMergeAlgorithm.continueMerging(sectionAppCount, mNumAppsPerRow, mergeCount, + section, mSections.get(i + 1)) && (i + 1) < mSections.size()) { SectionInfo nextSection = mSections.remove(i + 1); // Remove the next section break |