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

Commit 8164b5ce authored by Steve Kondik's avatar Steve Kondik
Browse files

Update the WallpaperPicker

 * Update from Launcher3 in Nougat. Includes lockscreen support.

Change-Id: I1752e7f09a8d67063d4baf9fdc9b410c7ffeaa3b
parent 3cd562df
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
        android:versionName="1.0"
        >

    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23" />
    <uses-sdk android:minSdkVersion="24" android:targetSdkVersion="24" />

    <!-- Permissions for setting the wallpaper -->
    <uses-permission android:name="android.permission.SET_WALLPAPER" />

res/anim/fade_out.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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.
-->

<!-- startOffset is the same as the duration of the wallpaper_enter animation. We have this delay so
    that we don't see the wallpaper changing before fading back to the home screen. -->
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
    android:startOffset="@android:integer/config_longAnimTime"
    android:duration="@android:integer/config_mediumAnimTime"
    android:fromAlpha="1"
    android:toAlpha="0"/>

res/drawable/black.png

deleted100644 → 0
−67 B
Loading image diff...
+2 −1
Original line number Diff line number Diff line
@@ -28,5 +28,6 @@
    android:drawableLeft="@drawable/ic_actionbar_accept"
    android:drawablePadding="8dp"
    android:gravity="start|center_vertical"
    android:text="@string/wallpaper_instructions">
    android:text="@string/wallpaper_instructions"
    android:enabled="false">
</org.cyanogenmod.wallpaperpicker.AlphaDisableableButton>
+8 −5
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@
    <string name="wallpaper_instructions" msgid="3524143401182707094">"Stel muurpapier"</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>
  <plurals name="number_of_items_selected">
    <item quantity="zero" msgid="9015111147509924344">"%1$d gekies"</item>
    <item quantity="one" msgid="8409622005831789373">"%1$d gekies"</item>
    <item quantity="other" msgid="479468347731745357">"%1$d gekies"</item>
    <string name="wallpaper_set_fail" msgid="7023180794008631780">"Kon nie prent as muurpapier stel nie"</string>
    <plurals name="number_of_items_selected" formatted="false" msgid="4578652015328149361">
      <item quantity="other">%1$d gekies</item>
      <item quantity="one">%1$d gekies</item>
    </plurals>
    <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>
@@ -33,4 +33,7 @@
    <string name="pick_image" msgid="3189640419551368385">"My foto\'s"</string>
    <string name="pick_wallpaper" msgid="4628969645948454559">"Muurpapiere"</string>
    <string name="crop_wallpaper" msgid="4882870800623585836">"Snoei muurpapier"</string>
    <string name="which_wallpaper_option_home_screen" msgid="5259213374485080595">"Tuisskerm"</string>
    <string name="which_wallpaper_option_lock_screen" msgid="5474588303389139825">"Sluitskerm"</string>
    <string name="which_wallpaper_option_home_screen_and_lock_screen" msgid="7652312651094808607">"Tuisskerm en sluitskerm"</string>
</resources>
Loading