Backgrounds: Bring it on our side

Signed-off-by: DarkJoker360 <simoespo159@gmail.com>

Android.mk

@@ -19,12 +19,6 @@ include $(CLEAR_VARS)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-ifeq ($(shell test $(TARGET_SCREEN_WIDTH) -gt 1080; echo $$?),0)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res_1440p
-else
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res_1080p
-endif
-
 LOCAL_USE_AAPT2 := true
 
 LOCAL_PACKAGE_NAME := Backgrounds

generate_smallvariants.py

@@ -5,8 +5,7 @@ from PIL import Image
 
 path = os.path.dirname(os.path.realpath(__file__))
 
-resources = ["res_1080p/drawable-nodpi",
-             "res_1440p/drawable-nodpi"]
+resources = "res/drawable-nodpi"
 
 def generate_smallvariants(resource):
     global path
@@ -19,9 +18,9 @@ def generate_smallvariants(resource):
         wallpaper_small = os.path.splitext(wallpaper)[0] + "_small.jpg"
         wallpaper_small_path = os.path.join(wallpapers_path, wallpaper_small)
 
-        # Save the wallpaper with 1/4 size to wallpaper_small_path
+        # Save the wallpaper with 1/3 size to wallpaper_small_path
         with Image.open(os.path.join(wallpapers_path, wallpaper)) as img:
-            size = int(img.width / 4), int(img.height / 4)
+            size = int(img.width / 3), int(img.height / 3)
 
             img_small = img.resize(size, Image.ANTIALIAS)
             img_small.save(wallpaper_small_path, "JPEG")
@@ -34,5 +33,4 @@ def clean(wallpapers_path):
         if wallpaper.endswith("_small.jpg"):
             os.remove(os.path.join(wallpapers_path, wallpaper))
 
-for resource in resources:
-    generate_smallvariants(resource)
+generate_smallvariants(resources)

res/values/arrays.xml

@@ -16,16 +16,17 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <array name="partner_wallpapers" translatable="false">
-        <item>ascension_blaze</item>
-        <item>ascension_ice</item>
-        <item>ascension_mist</item>
-        <item>ascension_shade</item>
-        <item>ascension_sunset</item>
-        <item>ascension_teal_light</item>
-        <item>expansion</item>
-        <item>operation</item>
-        <item>progression</item>
-        <item>propulsion</item>
-        <item>tessellation</item>
+        <item>sky</item>
+        <item>rainy_night</item>
+        <item>abstract_sky</item>
+        <item>mountains</item>
+        <item>mountains_lake</item>
+        <item>flowers</item>
+        <item>building</item>
+        <item>mountains_sunset</item>
+        <item>pink_blue</item>
+        <item>cyan_blue</item>
+        <item>green_fade</item>
+        <item>dark_fade</item>
     </array>
 </resources>

res_1440p/values/arrays.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2022-2023 The LineageOS 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <array name="partner_wallpapers" translatable="false">
-        <item>ascension_blaze</item>
-        <item>ascension_ice</item>
-        <item>ascension_mist</item>
-        <item>ascension_shade</item>
-        <item>ascension_sunset</item>
-        <item>ascension_teal_light</item>
-        <item>expansion</item>
-        <item>operation</item>
-        <item>progression</item>
-        <item>propulsion</item>
-        <item>tessellation</item>
-    </array>
-</resources>