Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe8a39d8 authored by Jon Miranda's avatar Jon Miranda
Browse files

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
parent dff92fe1

res/values-be/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
    <string name="safemode_shortcut_error" msgid="9160126848219158407">"Спампаваная праграма адключана ў Бяспечным рэжыме"</string>

    <string name="safemode_widget_error" msgid="4863470563535682004">"Віджэты адключаны ў Бяспечным рэжыме"</string>

    <string name="shortcut_not_available" msgid="2536503539825726397">"Ярлык недаступны"</string>

    <string name="home_screen" msgid="806512411299847073">"Галоўны экран"</string>

    <string name="custom_actions" msgid="3747508247759093328">"Спецыяльныя дзеянні"</string>

    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Дакраніцеся і ўтрымлiвайце віджэт, каб выбр. яго."</string>

    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Дакраніцеся двойчы і ўтрымлівайце, каб выбраць віджэт або выкарыстоўваць карыстальніцкія дзеянні."</string>

    <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
@@ -37,6 +39,7 @@ 
    <string name="all_apps_loading_message" msgid="5813968043155271636">"Праграмы загружаюцца…"</string>

    <string name="all_apps_no_search_results" msgid="3200346862396363786">"Праграм, якія адпавядаюць запыту \"<xliff:g id="QUERY">%1$s</xliff:g>\", не знойдзена"</string>

    <string name="all_apps_search_market_message" msgid="1366263386197059176">"Шукаць іншыя праграмы"</string>

    <string name="notifications_header" msgid="1404149926117359025">"Апавяшчэнні"</string>

    <string name="out_of_space" msgid="4691004494942118364">"На гэтым Галоўным экране больш няма месца."</string>

    <string name="hotseat_out_of_space" msgid="7448809638125333693">"У латку \"Абранае\" больш няма месца"</string>

    <string name="all_apps_button_label" msgid="8130441508702294465">"Спіс праграм"</string>
@@ -95,6 +98,7 @@ 
    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Праграма для гэтага значка не ўсталявана. Вы можаце выдаліць яе або выканаць пошук і ўсталяваць яе ўручную."</string>

    <string name="app_downloading_title" msgid="8336702962104482644">"Ідзе спампоўка <xliff:g id="NAME">%1$s</xliff:g>, <xliff:g id="PROGRESS">%2$s</xliff:g> завершана"</string>

    <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> чакае ўсталёўкі"</string>

    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Віджэты <xliff:g id="NAME">%1$s</xliff:g>"</string>

    <string name="action_add_to_workspace" msgid="8902165848117513641">"Дадаць на Галоўны экран"</string>

    <string name="action_move_here" msgid="2170188780612570250">"Перамясціць элемент сюды"</string>

    <string name="item_added_to_workspace" msgid="4211073925752213539">"Элемент дададзены на галоўны экран"</string>

res/values-et/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
    <string name="safemode_shortcut_error" msgid="9160126848219158407">"Allalaetud rakendus on turvarežiimis keelatud"</string>

    <string name="safemode_widget_error" msgid="4863470563535682004">"Turvarežiimis on vidinad keelatud"</string>

    <string name="shortcut_not_available" msgid="2536503539825726397">"Otsetee pole saadaval"</string>

    <string name="home_screen" msgid="806512411299847073">"Avaekraan"</string>

    <string name="custom_actions" msgid="3747508247759093328">"Kohandatud toimingud"</string>

    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Vidina valimiseks vajutage ja hoidke seda all."</string>

    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Topeltpuudutage ja hoidke vidina valimiseks või kohandatud toimingute kasutamiseks."</string>

    <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
@@ -37,6 +39,7 @@ 
    <string name="all_apps_loading_message" msgid="5813968043155271636">"Rakenduste laadimine …"</string>

    <string name="all_apps_no_search_results" msgid="3200346862396363786">"Päringule „<xliff:g id="QUERY">%1$s</xliff:g>” ei vastanud ükski rakendus"</string>

    <string name="all_apps_search_market_message" msgid="1366263386197059176">"Otsi rohkem rakendusi"</string>

    <string name="notifications_header" msgid="1404149926117359025">"Märguanded"</string>

    <string name="out_of_space" msgid="4691004494942118364">"Sellel avaekraanil pole enam ruumi."</string>

    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Salves Lemmikud pole rohkem ruumi"</string>

    <string name="all_apps_button_label" msgid="8130441508702294465">"Rakenduste loend"</string>
@@ -95,6 +98,7 @@ 
    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Selle ikooni rakendust pole installitud. Saate selle eemaldada või rakendust otsida ja käsitsi installida."</string>

    <string name="app_downloading_title" msgid="8336702962104482644">"Rakenduse <xliff:g id="NAME">%1$s</xliff:g> allalaadimine, <xliff:g id="PROGRESS">%2$s</xliff:g> on valmis"</string>

    <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> on installimise ootel"</string>

    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Teenuse <xliff:g id="NAME">%1$s</xliff:g> vidinad"</string>

    <string name="action_add_to_workspace" msgid="8902165848117513641">"Lisa avaekraanile"</string>

    <string name="action_move_here" msgid="2170188780612570250">"Teisalda üksus siia"</string>

    <string name="item_added_to_workspace" msgid="4211073925752213539">"Üksus lisati avaekraanile"</string>

res/values-ms/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
    <string name="safemode_shortcut_error" msgid="9160126848219158407">"Apl yang dimuat turun dilumpuhkan dalam mod Selamat"</string>

    <string name="safemode_widget_error" msgid="4863470563535682004">"Widget dilumpuhkan dalam mod Selamat"</string>

    <string name="shortcut_not_available" msgid="2536503539825726397">"Pintasan tidak tersedia"</string>

    <string name="home_screen" msgid="806512411299847073">"Skrin utama"</string>

    <string name="custom_actions" msgid="3747508247759093328">"Tindakan tersuai"</string>

    <string name="long_press_widget_to_add" msgid="7699152356777458215">"Sentuh &amp; tahan untuk mengambil widget."</string>

    <string name="long_accessible_way_to_add" msgid="4289502106628154155">"Ketik dua kali &amp; tahan untuk mengambil widget atau menggunakan tindakan tersuai"</string>

    <string name="widget_dims_format" msgid="2370757736025621599">"%1$d × %2$d"</string>
@@ -37,6 +39,7 @@ 
    <string name="all_apps_loading_message" msgid="5813968043155271636">"Memuatkan apl…"</string>

    <string name="all_apps_no_search_results" msgid="3200346862396363786">"Tiada apl yang ditemui sepadan dengan \"<xliff:g id="QUERY">%1$s</xliff:g>\""</string>

    <string name="all_apps_search_market_message" msgid="1366263386197059176">"Cari lagi apl"</string>

    <string name="notifications_header" msgid="1404149926117359025">"Pemberitahuan"</string>

    <string name="out_of_space" msgid="4691004494942118364">"Tiada lagi ruang pada skrin Laman Utama ini."</string>

    <string name="hotseat_out_of_space" msgid="7448809638125333693">"Tiada ruang dalam dulang Kegemaran lagi"</string>

    <string name="all_apps_button_label" msgid="8130441508702294465">"Senarai apl"</string>
@@ -95,6 +98,7 @@ 
    <string name="abandoned_promise_explanation" msgid="3990027586878167529">"Apl untuk ikon ini tidak dipasang. Anda boleh mengalih keluar atau mencari dan memasang apl itu secara manual."</string>

    <string name="app_downloading_title" msgid="8336702962104482644">"<xliff:g id="NAME">%1$s</xliff:g> memuat turun, <xliff:g id="PROGRESS">%2$s</xliff:g> selesai"</string>

    <string name="app_waiting_download_title" msgid="7053938513995617849">"<xliff:g id="NAME">%1$s</xliff:g> menunggu untuk dipasang"</string>

    <string name="widgets_bottom_sheet_title" msgid="2904559530954183366">"Widget <xliff:g id="NAME">%1$s</xliff:g>"</string>

    <string name="action_add_to_workspace" msgid="8902165848117513641">"Tambahkan pada Skrin Utama"</string>

    <string name="action_move_here" msgid="2170188780612570250">"Alihkan item ke sini"</string>

    <string name="item_added_to_workspace" msgid="4211073925752213539">"Item ditambahkan pada skrin utama"</string>

src/com/android/launcher3/allapps/search/DefaultAppSearchAlgorithm.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

        }

    }

tests/Android.mk

+1 −5
Original line number Diff line number Diff line
@@ -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