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

Commit 2aca1b18 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by android-build-merger
Browse files

Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff 

am: 908298f5

* commit '908298f5':
  Fixing homescreen getting blank when returning from the overlay
  Fixing scrollTo getting called even though the gesture was handled by an overlay
  Adding overlay interaction support
  Cleaning up the overlay interface
  Enable selection action mode for Android M+.
  Fix home button returning to now screen issue
  Fixing bug where the widget background enters into a focused state if a child calls requestFocus in xml
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Return 1f in Log(Ac/De)celerateInterpolators on a 1f input.
  Revert "Calling start/stop listening in onStart/onStop"
  Fix incorrect icon greying on pre-N system
  Setting stable layout flags on the launcher, so that the instets do not change for launcher when going in/out of another app
  Showing a toast when changing wallaper is disabled
  Fix recyclerview res path

Change-Id: I72cb839742495c5272fc24a5c25ead892457e9f7
parents 724e51e8 908298f5

WallpaperPicker/res/values-af/strings.xml

+10 −5
Original line number Original line Diff line number Diff line
@@ -23,10 +23,9 @@ 
    <string name="image_load_fail" msgid="7538534580694411837">"Kon nie prent laai nie"</string>

    <string name="image_load_fail" msgid="7538534580694411837">"Kon nie prent laai nie"</string>

    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kon nie prent as muurpapier laai nie"</string>

    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kon nie prent as muurpapier laai nie"</string>

    <string name="wallpaper_set_fail" msgid="7023180794008631780">"Kon nie prent as muurpapier stel nie"</string>

    <string name="wallpaper_set_fail" msgid="7023180794008631780">"Kon nie prent as muurpapier stel nie"</string>

  <plurals name="number_of_items_selected">

    <plurals name="number_of_items_selected" formatted="false" msgid="4578652015328149361">

    <item quantity="zero" msgid="9015111147509924344">"%1$d gekies"</item>

      <item quantity="other">%1$d gekies</item>

    <item quantity="one" msgid="8409622005831789373">"%1$d gekies"</item>

      <item quantity="one">%1$d gekies</item>

    <item quantity="other" msgid="479468347731745357">"%1$d gekies"</item>

    </plurals>

    </plurals>

    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Muurpapier %1$d van %2$d"</string>

    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Muurpapier %1$d van %2$d"</string>

    <string name="announce_selection" msgid="123723511662250539">"Het <xliff:g id="LABEL">%1$s</xliff:g> gekies"</string>

    <string name="announce_selection" msgid="123723511662250539">"Het <xliff:g id="LABEL">%1$s</xliff:g> gekies"</string>
@@ -34,4 +33,10 @@ 
    <string name="pick_image" msgid="3189640419551368385">"My foto\'s"</string>

    <string name="pick_image" msgid="3189640419551368385">"My foto\'s"</string>

    <string name="pick_wallpaper" msgid="4628969645948454559">"Muurpapiere"</string>

    <string name="pick_wallpaper" msgid="4628969645948454559">"Muurpapiere"</string>

    <string name="crop_wallpaper" msgid="4882870800623585836">"Snoei muurpapier"</string>

    <string name="crop_wallpaper" msgid="4882870800623585836">"Snoei muurpapier"</string>

    <!-- no translation found for which_wallpaper_option_home_screen (5259213374485080595) -->

    <skip />

    <!-- no translation found for which_wallpaper_option_lock_screen (5474588303389139825) -->

    <skip />

    <!-- no translation found for which_wallpaper_option_home_screen_and_lock_screen (7652312651094808607) -->

    <skip />

</resources>
 
</resources>

WallpaperPicker/res/values-am/strings.xml

+10 −5
Original line number Original line Diff line number Diff line
@@ -23,10 +23,9 @@ 
    <string name="image_load_fail" msgid="7538534580694411837">"ምስሉን መጫን አልተቻለም"</string>

    <string name="image_load_fail" msgid="7538534580694411837">"ምስሉን መጫን አልተቻለም"</string>

    <string name="wallpaper_load_fail" msgid="4800700444605404650">"ምስሉን እንደ ግድግዳ ወረቀት መጫን አልተቻለም"</string>

    <string name="wallpaper_load_fail" msgid="4800700444605404650">"ምስሉን እንደ ግድግዳ ወረቀት መጫን አልተቻለም"</string>

    <string name="wallpaper_set_fail" msgid="7023180794008631780">"ምስሉን እንደ ግድግዳ ወረቀት ማዘጋጀት አልተቻለም"</string>

    <string name="wallpaper_set_fail" msgid="7023180794008631780">"ምስሉን እንደ ግድግዳ ወረቀት ማዘጋጀት አልተቻለም"</string>

  <plurals name="number_of_items_selected">

    <plurals name="number_of_items_selected" formatted="false" msgid="4578652015328149361">

    <item quantity="zero" msgid="9015111147509924344">"%1$d ተመርጧል"</item>

      <item quantity="one">%1$d ተመርጧል</item>

    <item quantity="one" msgid="8409622005831789373">"%1$d ተመርጧል"</item>

      <item quantity="other">%1$d ተመርጠዋል</item>

    <item quantity="other" msgid="479468347731745357">"%1$d ተመርጧል"</item>

    </plurals>

    </plurals>

    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ልጣፍ  %1$d የ%2$d"</string>

    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"ልጣፍ  %1$d የ%2$d"</string>

    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ተመርጧል"</string>

    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> ተመርጧል"</string>
@@ -34,4 +33,10 @@ 
    <string name="pick_image" msgid="3189640419551368385">"የእኔ ፎቶዎች"</string>

    <string name="pick_image" msgid="3189640419551368385">"የእኔ ፎቶዎች"</string>

    <string name="pick_wallpaper" msgid="4628969645948454559">"የግድግዳ ወረቀቶች"</string>

    <string name="pick_wallpaper" msgid="4628969645948454559">"የግድግዳ ወረቀቶች"</string>

    <string name="crop_wallpaper" msgid="4882870800623585836">"ልጣፍ  ይከርክሙ"</string>

    <string name="crop_wallpaper" msgid="4882870800623585836">"ልጣፍ  ይከርክሙ"</string>

    <!-- no translation found for which_wallpaper_option_home_screen (5259213374485080595) -->

    <skip />

    <!-- no translation found for which_wallpaper_option_lock_screen (5474588303389139825) -->

    <skip />

    <!-- no translation found for which_wallpaper_option_home_screen_and_lock_screen (7652312651094808607) -->

    <skip />

</resources>
 
</resources>

WallpaperPicker/res/values-ar/strings.xml

+11 −5
Original line number Original line Diff line number Diff line
@@ -23,10 +23,13 @@ 
    <string name="image_load_fail" msgid="7538534580694411837">"تعذر تحميل الصورة"</string>

    <string name="image_load_fail" msgid="7538534580694411837">"تعذر تحميل الصورة"</string>

    <string name="wallpaper_load_fail" msgid="4800700444605404650">"تعذر تحميل الصورة كخلفية"</string>

    <string name="wallpaper_load_fail" msgid="4800700444605404650">"تعذر تحميل الصورة كخلفية"</string>

    <string name="wallpaper_set_fail" msgid="7023180794008631780">"تعذر تعيين الصورة كخلفية"</string>

    <string name="wallpaper_set_fail" msgid="7023180794008631780">"تعذر تعيين الصورة كخلفية"</string>

  <plurals name="number_of_items_selected">

    <plurals name="number_of_items_selected" formatted="false" msgid="4578652015328149361">

    <item quantity="zero" msgid="9015111147509924344">"‏تم تحديد %1$d"</item>

      <item quantity="zero">‏تم تحديد %1$d</item>

    <item quantity="one" msgid="8409622005831789373">"‏تم تحديد %1$d"</item>

      <item quantity="two">‏تم تحديد %1$d</item>

    <item quantity="other" msgid="479468347731745357">"‏تم تحديد %1$d"</item>

      <item quantity="few">‏تم تحديد %1$d</item>

      <item quantity="many">‏تم تحديد %1$d</item>

      <item quantity="other">‏تم تحديد %1$d</item>

      <item quantity="one">‏تم تحديد %1$d</item>

    </plurals>

    </plurals>

    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏الخلفية %1$d من %2$d"</string>

    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"‏الخلفية %1$d من %2$d"</string>

    <string name="announce_selection" msgid="123723511662250539">"تم تحديد <xliff:g id="LABEL">%1$s</xliff:g>"</string>

    <string name="announce_selection" msgid="123723511662250539">"تم تحديد <xliff:g id="LABEL">%1$s</xliff:g>"</string>
@@ -34,4 +37,7 @@ 
    <string name="pick_image" msgid="3189640419551368385">"صوري"</string>

    <string name="pick_image" msgid="3189640419551368385">"صوري"</string>

    <string name="pick_wallpaper" msgid="4628969645948454559">"الخلفيات"</string>

    <string name="pick_wallpaper" msgid="4628969645948454559">"الخلفيات"</string>

    <string name="crop_wallpaper" msgid="4882870800623585836">"اقتصاص الخلفية"</string>

    <string name="crop_wallpaper" msgid="4882870800623585836">"اقتصاص الخلفية"</string>

    <string name="which_wallpaper_option_home_screen" msgid="5259213374485080595">"الشاشة الرئيسية"</string>

    <string name="which_wallpaper_option_lock_screen" msgid="5474588303389139825">"شاشة التأمين"</string>

    <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="7652312651094808607">"الشاشة الرئيسية وشاشة التأمين"</string>

</resources>
 
</resources>

WallpaperPicker/res/values-az-rAZ/strings.xml

+11 −5
Original line number Original line Diff line number Diff line
@@ -22,10 +22,10 @@ 
    <string name="wallpaper_instructions" msgid="3524143401182707094">"Divar kağı seçin"</string>

    <string name="wallpaper_instructions" msgid="3524143401182707094">"Divar kağı seçin"</string>

    <string name="image_load_fail" msgid="7538534580694411837">"Şəkli yükləmək alınmadı"</string>

    <string name="image_load_fail" msgid="7538534580694411837">"Şəkli yükləmək alınmadı"</string>

    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Şəkli divar kağızı olaraq yükləmək alınmadı"</string>

    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Şəkli divar kağızı olaraq yükləmək alınmadı"</string>

  <plurals name="number_of_items_selected">

    <string name="wallpaper_set_fail" msgid="7023180794008631780">"Şəkli divar kağızı olaraq quraşdırmaq alınmadı"</string>

    <item quantity="zero" msgid="9015111147509924344">"%1$d seçilib"</item>

    <plurals name="number_of_items_selected" formatted="false" msgid="4578652015328149361">

    <item quantity="one" msgid="8409622005831789373">"%1$d seçilib"</item>

      <item quantity="other">%1$d seçilib</item>

    <item quantity="other" msgid="479468347731745357">"%1$d seçilib"</item>

      <item quantity="one">%1$d seçilib</item>

    </plurals>

    </plurals>

    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Divar kağızı %1$d of %2$d"</string>

    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Divar kağızı %1$d of %2$d"</string>

    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seçilib"</string>

    <string name="announce_selection" msgid="123723511662250539">"<xliff:g id="LABEL">%1$s</xliff:g> seçilib"</string>
@@ -33,4 +33,10 @@ 
    <string name="pick_image" msgid="3189640419551368385">"Fotolarım"</string>

    <string name="pick_image" msgid="3189640419551368385">"Fotolarım"</string>

    <string name="pick_wallpaper" msgid="4628969645948454559">"Divar kağızları"</string>

    <string name="pick_wallpaper" msgid="4628969645948454559">"Divar kağızları"</string>

    <string name="crop_wallpaper" msgid="4882870800623585836">"Divar kağızını kəsin"</string>

    <string name="crop_wallpaper" msgid="4882870800623585836">"Divar kağızını kəsin"</string>

    <!-- no translation found for which_wallpaper_option_home_screen (5259213374485080595) -->

    <skip />

    <!-- no translation found for which_wallpaper_option_lock_screen (5474588303389139825) -->

    <skip />

    <!-- no translation found for which_wallpaper_option_home_screen_and_lock_screen (7652312651094808607) -->

    <skip />

</resources>
 
</resources>

WallpaperPicker/res/values-b+sr+Latn/strings.xml

0 → 100644
+43 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- 

/*

* Copyright (C) 2013 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.

*/

 -->



<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="wallpaper_instructions" msgid="3524143401182707094">"Podesi pozadinu"</string>

    <string name="image_load_fail" msgid="7538534580694411837">"Nije moguće učitati sliku"</string>

    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Nije moguće učitati sliku kao pozadinu"</string>

    <string name="wallpaper_set_fail" msgid="7023180794008631780">"Učitavanje slike kao pozadine nije uspelo"</string>

    <plurals name="number_of_items_selected" formatted="false" msgid="4578652015328149361">

      <item quantity="one">Izabrana je %1$d stavka</item>

      <item quantity="few">Izabrane su %1$d stavke</item>

      <item quantity="other">Izabrano je %1$d stavki</item>

    </plurals>

    <string name="wallpaper_accessibility_name" msgid="4093221025304876354">"Pozadina %1$d od %2$d"</string>

    <string name="announce_selection" msgid="123723511662250539">"Izabrana je <xliff:g id="LABEL">%1$s</xliff:g>"</string>

    <string name="wallpaper_delete" msgid="1459353972739215344">"Izbriši"</string>

    <string name="pick_image" msgid="3189640419551368385">"Moje fotografije"</string>

    <string name="pick_wallpaper" msgid="4628969645948454559">"Pozadine"</string>

    <string name="crop_wallpaper" msgid="4882870800623585836">"Opseci pozadinu"</string>

    <!-- no translation found for which_wallpaper_option_home_screen (5259213374485080595) -->

    <skip />

    <!-- no translation found for which_wallpaper_option_lock_screen (5474588303389139825) -->

    <skip />

    <!-- no translation found for which_wallpaper_option_home_screen_and_lock_screen (7652312651094808607) -->

    <skip />

</resources>