summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-06-01 11:18:12 -0700
committerWinson Chung <winsonc@google.com>2015-06-01 18:26:55 +0000
commit595395d84f0507a1c5c163ad4722fa4345376079 (patch)
tree2321ea459b700c483d453b4004322fb5bc5d5885 /src
parentac5f6af1488ec1cf0b73aa0848a675764c2f652b (diff)
downloadandroid_packages_apps_Trebuchet-595395d84f0507a1c5c163ad4722fa4345376079.tar.gz
android_packages_apps_Trebuchet-595395d84f0507a1c5c163ad4722fa4345376079.tar.bz2
android_packages_apps_Trebuchet-595395d84f0507a1c5c163ad4722fa4345376079.zip
Avoid merging sections across scripts.
Bug: 20222023 Change-Id: I6f6577112845fec14ae2e9c6e88ff3569bd2f1af
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/allapps/AlphabeticalAppsList.java27
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