mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-04 09:56:49 +00:00
d164b7f4ab
Indexer depends on the locale and should be created when ever the config changes. Moving the widget indexing to the adapter (similar to allApps) which gets created whenever the activity is recreated. This fixes the bug where widgets indexing breaks if locale changes while launcher process is alive Also fixing the bug in widget model cloning where the HashMap was not cloning the underlying ArrayList Change-Id: I7dbe6290e73299c4c07aa7fa564077a2649e1a4c
47 lines
1.6 KiB
Java
47 lines
1.6 KiB
Java
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package com.android.launcher3.util;
|
|
|
|
import java.text.Collator;
|
|
import java.util.Comparator;
|
|
|
|
/**
|
|
* Extension of {@link java.text.Collator} with special handling for digits. Used for comparing
|
|
* user visible labels.
|
|
*/
|
|
public class LabelComparator implements Comparator<String> {
|
|
|
|
private final Collator mCollator = Collator.getInstance();
|
|
|
|
@Override
|
|
public int compare(String titleA, String titleB) {
|
|
// Ensure that we de-prioritize any titles that don't start with a
|
|
// linguistic letter or digit
|
|
boolean aStartsWithLetter = (titleA.length() > 0) &&
|
|
Character.isLetterOrDigit(titleA.codePointAt(0));
|
|
boolean bStartsWithLetter = (titleB.length() > 0) &&
|
|
Character.isLetterOrDigit(titleB.codePointAt(0));
|
|
if (aStartsWithLetter && !bStartsWithLetter) {
|
|
return -1;
|
|
} else if (!aStartsWithLetter && bStartsWithLetter) {
|
|
return 1;
|
|
}
|
|
|
|
// Order by the title in the current locale
|
|
return mCollator.compare(titleA, titleB);
|
|
}
|
|
}
|