From fe8a39d8b0750a332787abbe1a210fb55e444223 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Mon, 28 Aug 2017 18:39:24 -0400 Subject: Ensure no diffs b/w oc-mr1-dev and ub-launcher3-dorval-polish2. This should ensure that all future code drops will be able to merge cleanly. Bug: 64937210 Test: Manual test Change-Id: I4f7952d0e979402e120b29dc501ac7fff3de2879 --- res/values-be/strings.xml | 4 ++++ res/values-et/strings.xml | 4 ++++ res/values-ms/strings.xml | 4 ++++ .../android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java | 3 +-- tests/Android.mk | 6 +----- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 4b4e95f1f..0a31ddf7c 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -27,6 +27,8 @@ "Спампаваная праграма адключана ў Бяспечным рэжыме" "Віджэты адключаны ў Бяспечным рэжыме" "Ярлык недаступны" + "Галоўны экран" + "Спецыяльныя дзеянні" "Дакраніцеся і ўтрымлiвайце віджэт, каб выбр. яго." "Дакраніцеся двойчы і ўтрымлівайце, каб выбраць віджэт або выкарыстоўваць карыстальніцкія дзеянні." "%1$d × %2$d" @@ -37,6 +39,7 @@ "Праграмы загружаюцца…" "Праграм, якія адпавядаюць запыту \"%1$s\", не знойдзена" "Шукаць іншыя праграмы" + "Апавяшчэнні" "На гэтым Галоўным экране больш няма месца." "У латку \"Абранае\" больш няма месца" "Спіс праграм" @@ -95,6 +98,7 @@ "Праграма для гэтага значка не ўсталявана. Вы можаце выдаліць яе або выканаць пошук і ўсталяваць яе ўручную." "Ідзе спампоўка %1$s, %2$s завершана" "%1$s чакае ўсталёўкі" + "Віджэты %1$s" "Дадаць на Галоўны экран" "Перамясціць элемент сюды" "Элемент дададзены на галоўны экран" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 4c90bdc5e..9d9991ddc 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -27,6 +27,8 @@ "Allalaetud rakendus on turvarežiimis keelatud" "Turvarežiimis on vidinad keelatud" "Otsetee pole saadaval" + "Avaekraan" + "Kohandatud toimingud" "Vidina valimiseks vajutage ja hoidke seda all." "Topeltpuudutage ja hoidke vidina valimiseks või kohandatud toimingute kasutamiseks." "%1$d × %2$d" @@ -37,6 +39,7 @@ "Rakenduste laadimine …" "Päringule „%1$s” ei vastanud ükski rakendus" "Otsi rohkem rakendusi" + "Märguanded" "Sellel avaekraanil pole enam ruumi." "Salves Lemmikud pole rohkem ruumi" "Rakenduste loend" @@ -95,6 +98,7 @@ "Selle ikooni rakendust pole installitud. Saate selle eemaldada või rakendust otsida ja käsitsi installida." "Rakenduse %1$s allalaadimine, %2$s on valmis" "%1$s on installimise ootel" + "Teenuse %1$s vidinad" "Lisa avaekraanile" "Teisalda üksus siia" "Üksus lisati avaekraanile" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index e142b0b6e..f94b167a6 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -27,6 +27,8 @@ "Apl yang dimuat turun dilumpuhkan dalam mod Selamat" "Widget dilumpuhkan dalam mod Selamat" "Pintasan tidak tersedia" + "Skrin utama" + "Tindakan tersuai" "Sentuh & tahan untuk mengambil widget." "Ketik dua kali & tahan untuk mengambil widget atau menggunakan tindakan tersuai" "%1$d × %2$d" @@ -37,6 +39,7 @@ "Memuatkan apl…" "Tiada apl yang ditemui sepadan dengan \"%1$s\"" "Cari lagi apl" + "Pemberitahuan" "Tiada lagi ruang pada skrin Laman Utama ini." "Tiada ruang dalam dulang Kegemaran lagi" "Senarai apl" @@ -95,6 +98,7 @@ "Apl untuk ikon ini tidak dipasang. Anda boleh mengalih keluar atau mencari dan memasang apl itu secara manual." "%1$s memuat turun, %2$s selesai" "%1$s menunggu untuk dipasang" + "Widget %1$s" "Tambahkan pada Skrin Utama" "Alihkan item ke sini" "Item ditambahkan pada skrin utama" diff --git a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java index e9dead399..26f6ec357 100644 --- a/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java +++ b/src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java @@ -141,8 +141,7 @@ public class DefaultAppSearchAlgorithm implements SearchAlgorithm { // Always a break point for a symbol return true; default: - // Always a break point at first character - return prevType == Character.UNASSIGNED; + return false; } } diff --git a/tests/Android.mk b/tests/Android.mk index 6e6453ca1..e8797a75c 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -17,11 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - ub-uiautomator \ - legacy-android-test \ - mockito-target-minus-junit4 +LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4 LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml -- cgit v1.2.3