Revert "Include a limited set of wallpapers on devices with small /system"
This reverts commit 273b03e44acb4ab79044127d2e89e24143058b07.
Change-Id: I515bd96e51ee7575a758bab5f099d41ce012fcc8
diff --git a/Android.mk b/Android.mk
index 0a065a3..8d1b0ea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,19 +20,9 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
ifeq ($(shell test $(TARGET_SCREEN_WIDTH) -gt 1080; echo $$?),0)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res_1440p/common
-ifeq ($(PRODUCT_SIZE), mini)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res_1440p/small
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res_1440p
else
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res_1440p/full
-endif
-else
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res_1080p/common
-ifeq ($(PRODUCT_SIZE), mini)
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res_1080p/small
-else
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res_1080p/full
-endif
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res_1080p
endif
LOCAL_USE_AAPT2 := true
diff --git a/generate_smallvariants.py b/generate_smallvariants.py
index 3e09ed2..e096ce2 100644
--- a/generate_smallvariants.py
+++ b/generate_smallvariants.py
@@ -6,10 +6,8 @@
path = os.path.dirname(os.path.realpath(__file__))
-resources = ["res_1080p/common/drawable-nodpi",
- "res_1080p/full/drawable-nodpi",
- "res_1440p/common/drawable-nodpi",
- "res_1440p/full/drawable-nodpi"]
+resources = ["res_1080p/drawable-nodpi",
+ "res_1440p/drawable-nodpi"]
def generate_smallvariants(resource):
global path
diff --git a/res_1080p/full/drawable-nodpi/abstract_ink.jpg b/res_1080p/drawable-nodpi/abstract_ink.jpg
similarity index 100%
rename from res_1080p/full/drawable-nodpi/abstract_ink.jpg
rename to res_1080p/drawable-nodpi/abstract_ink.jpg
Binary files differ
diff --git a/res_1080p/full/drawable-nodpi/abstract_ink_small.jpg b/res_1080p/drawable-nodpi/abstract_ink_small.jpg
similarity index 100%
rename from res_1080p/full/drawable-nodpi/abstract_ink_small.jpg
rename to res_1080p/drawable-nodpi/abstract_ink_small.jpg
Binary files differ
diff --git a/res_1080p/common/drawable-nodpi/abstract_orderofchaos.jpg b/res_1080p/drawable-nodpi/abstract_orderofchaos.jpg
similarity index 100%
rename from res_1080p/common/drawable-nodpi/abstract_orderofchaos.jpg
rename to res_1080p/drawable-nodpi/abstract_orderofchaos.jpg
Binary files differ
diff --git a/res_1080p/common/drawable-nodpi/abstract_orderofchaos_small.jpg b/res_1080p/drawable-nodpi/abstract_orderofchaos_small.jpg
similarity index 100%
rename from res_1080p/common/drawable-nodpi/abstract_orderofchaos_small.jpg
rename to res_1080p/drawable-nodpi/abstract_orderofchaos_small.jpg
Binary files differ
diff --git a/res_1080p/full/drawable-nodpi/abstract_spacestory.jpg b/res_1080p/drawable-nodpi/abstract_spacestory.jpg
similarity index 100%
rename from res_1080p/full/drawable-nodpi/abstract_spacestory.jpg
rename to res_1080p/drawable-nodpi/abstract_spacestory.jpg
Binary files differ
diff --git a/res_1080p/full/drawable-nodpi/abstract_spacestory_small.jpg b/res_1080p/drawable-nodpi/abstract_spacestory_small.jpg
similarity index 100%
rename from res_1080p/full/drawable-nodpi/abstract_spacestory_small.jpg
rename to res_1080p/drawable-nodpi/abstract_spacestory_small.jpg
Binary files differ
diff --git a/res_1080p/common/drawable-nodpi/nature_ice.jpg b/res_1080p/drawable-nodpi/nature_ice.jpg
similarity index 100%
rename from res_1080p/common/drawable-nodpi/nature_ice.jpg
rename to res_1080p/drawable-nodpi/nature_ice.jpg
Binary files differ
diff --git a/res_1080p/common/drawable-nodpi/nature_ice_small.jpg b/res_1080p/drawable-nodpi/nature_ice_small.jpg
similarity index 100%
rename from res_1080p/common/drawable-nodpi/nature_ice_small.jpg
rename to res_1080p/drawable-nodpi/nature_ice_small.jpg
Binary files differ
diff --git a/res_1080p/common/drawable-nodpi/nature_nebula.jpg b/res_1080p/drawable-nodpi/nature_nebula.jpg
similarity index 100%
rename from res_1080p/common/drawable-nodpi/nature_nebula.jpg
rename to res_1080p/drawable-nodpi/nature_nebula.jpg
Binary files differ
diff --git a/res_1080p/common/drawable-nodpi/nature_nebula_small.jpg b/res_1080p/drawable-nodpi/nature_nebula_small.jpg
similarity index 100%
rename from res_1080p/common/drawable-nodpi/nature_nebula_small.jpg
rename to res_1080p/drawable-nodpi/nature_nebula_small.jpg
Binary files differ
diff --git a/res_1080p/common/drawable-nodpi/nature_night.jpg b/res_1080p/drawable-nodpi/nature_night.jpg
similarity index 100%
rename from res_1080p/common/drawable-nodpi/nature_night.jpg
rename to res_1080p/drawable-nodpi/nature_night.jpg
Binary files differ
diff --git a/res_1080p/common/drawable-nodpi/nature_night_small.jpg b/res_1080p/drawable-nodpi/nature_night_small.jpg
similarity index 100%
rename from res_1080p/common/drawable-nodpi/nature_night_small.jpg
rename to res_1080p/drawable-nodpi/nature_night_small.jpg
Binary files differ
diff --git a/res_1080p/full/drawable-nodpi/nature_sea.jpg b/res_1080p/drawable-nodpi/nature_sea.jpg
similarity index 100%
rename from res_1080p/full/drawable-nodpi/nature_sea.jpg
rename to res_1080p/drawable-nodpi/nature_sea.jpg
Binary files differ
diff --git a/res_1080p/full/drawable-nodpi/nature_sea_small.jpg b/res_1080p/drawable-nodpi/nature_sea_small.jpg
similarity index 100%
rename from res_1080p/full/drawable-nodpi/nature_sea_small.jpg
rename to res_1080p/drawable-nodpi/nature_sea_small.jpg
Binary files differ
diff --git a/res_1080p/full/drawable-nodpi/space_riseup.jpg b/res_1080p/drawable-nodpi/space_riseup.jpg
similarity index 100%
rename from res_1080p/full/drawable-nodpi/space_riseup.jpg
rename to res_1080p/drawable-nodpi/space_riseup.jpg
Binary files differ
diff --git a/res_1080p/full/drawable-nodpi/space_riseup_small.jpg b/res_1080p/drawable-nodpi/space_riseup_small.jpg
similarity index 100%
rename from res_1080p/full/drawable-nodpi/space_riseup_small.jpg
rename to res_1080p/drawable-nodpi/space_riseup_small.jpg
Binary files differ
diff --git a/res_1080p/common/drawable-nodpi/urban_dayroad.jpg b/res_1080p/drawable-nodpi/urban_dayroad.jpg
similarity index 100%
rename from res_1080p/common/drawable-nodpi/urban_dayroad.jpg
rename to res_1080p/drawable-nodpi/urban_dayroad.jpg
Binary files differ
diff --git a/res_1080p/common/drawable-nodpi/urban_dayroad_small.jpg b/res_1080p/drawable-nodpi/urban_dayroad_small.jpg
similarity index 100%
rename from res_1080p/common/drawable-nodpi/urban_dayroad_small.jpg
rename to res_1080p/drawable-nodpi/urban_dayroad_small.jpg
Binary files differ
diff --git a/res_1080p/full/drawable-nodpi/urban_nightroad.jpg b/res_1080p/drawable-nodpi/urban_nightroad.jpg
similarity index 100%
rename from res_1080p/full/drawable-nodpi/urban_nightroad.jpg
rename to res_1080p/drawable-nodpi/urban_nightroad.jpg
Binary files differ
diff --git a/res_1080p/full/drawable-nodpi/urban_nightroad_small.jpg b/res_1080p/drawable-nodpi/urban_nightroad_small.jpg
similarity index 100%
rename from res_1080p/full/drawable-nodpi/urban_nightroad_small.jpg
rename to res_1080p/drawable-nodpi/urban_nightroad_small.jpg
Binary files differ
diff --git a/res_1080p/small/values/arrays.xml b/res_1080p/small/values/arrays.xml
deleted file mode 100644
index 92a3452..0000000
--- a/res_1080p/small/values/arrays.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2020 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="wallpapers" translatable="false">
- <item>abstract_orderofchaos</item>
- <item>nature_ice</item>
- <item>nature_nebula</item>
- <item>nature_night</item>
- <item>urban_dayroad</item>
- </array>
-</resources>
diff --git a/res_1080p/full/values/arrays.xml b/res_1080p/values/arrays.xml
similarity index 100%
rename from res_1080p/full/values/arrays.xml
rename to res_1080p/values/arrays.xml
diff --git a/res_1440p/full/drawable-nodpi/abstract_ink.jpg b/res_1440p/drawable-nodpi/abstract_ink.jpg
similarity index 100%
rename from res_1440p/full/drawable-nodpi/abstract_ink.jpg
rename to res_1440p/drawable-nodpi/abstract_ink.jpg
Binary files differ
diff --git a/res_1440p/full/drawable-nodpi/abstract_ink_small.jpg b/res_1440p/drawable-nodpi/abstract_ink_small.jpg
similarity index 100%
rename from res_1440p/full/drawable-nodpi/abstract_ink_small.jpg
rename to res_1440p/drawable-nodpi/abstract_ink_small.jpg
Binary files differ
diff --git a/res_1440p/common/drawable-nodpi/abstract_orderofchaos.jpg b/res_1440p/drawable-nodpi/abstract_orderofchaos.jpg
similarity index 100%
rename from res_1440p/common/drawable-nodpi/abstract_orderofchaos.jpg
rename to res_1440p/drawable-nodpi/abstract_orderofchaos.jpg
Binary files differ
diff --git a/res_1440p/common/drawable-nodpi/abstract_orderofchaos_small.jpg b/res_1440p/drawable-nodpi/abstract_orderofchaos_small.jpg
similarity index 100%
rename from res_1440p/common/drawable-nodpi/abstract_orderofchaos_small.jpg
rename to res_1440p/drawable-nodpi/abstract_orderofchaos_small.jpg
Binary files differ
diff --git a/res_1440p/full/drawable-nodpi/abstract_spacestory.jpg b/res_1440p/drawable-nodpi/abstract_spacestory.jpg
similarity index 100%
rename from res_1440p/full/drawable-nodpi/abstract_spacestory.jpg
rename to res_1440p/drawable-nodpi/abstract_spacestory.jpg
Binary files differ
diff --git a/res_1440p/full/drawable-nodpi/abstract_spacestory_small.jpg b/res_1440p/drawable-nodpi/abstract_spacestory_small.jpg
similarity index 100%
rename from res_1440p/full/drawable-nodpi/abstract_spacestory_small.jpg
rename to res_1440p/drawable-nodpi/abstract_spacestory_small.jpg
Binary files differ
diff --git a/res_1440p/common/drawable-nodpi/nature_ice.jpg b/res_1440p/drawable-nodpi/nature_ice.jpg
similarity index 100%
rename from res_1440p/common/drawable-nodpi/nature_ice.jpg
rename to res_1440p/drawable-nodpi/nature_ice.jpg
Binary files differ
diff --git a/res_1440p/common/drawable-nodpi/nature_ice_small.jpg b/res_1440p/drawable-nodpi/nature_ice_small.jpg
similarity index 100%
rename from res_1440p/common/drawable-nodpi/nature_ice_small.jpg
rename to res_1440p/drawable-nodpi/nature_ice_small.jpg
Binary files differ
diff --git a/res_1440p/common/drawable-nodpi/nature_nebula.jpg b/res_1440p/drawable-nodpi/nature_nebula.jpg
similarity index 100%
rename from res_1440p/common/drawable-nodpi/nature_nebula.jpg
rename to res_1440p/drawable-nodpi/nature_nebula.jpg
Binary files differ
diff --git a/res_1440p/common/drawable-nodpi/nature_nebula_small.jpg b/res_1440p/drawable-nodpi/nature_nebula_small.jpg
similarity index 100%
rename from res_1440p/common/drawable-nodpi/nature_nebula_small.jpg
rename to res_1440p/drawable-nodpi/nature_nebula_small.jpg
Binary files differ
diff --git a/res_1440p/common/drawable-nodpi/nature_night.jpg b/res_1440p/drawable-nodpi/nature_night.jpg
similarity index 100%
rename from res_1440p/common/drawable-nodpi/nature_night.jpg
rename to res_1440p/drawable-nodpi/nature_night.jpg
Binary files differ
diff --git a/res_1440p/common/drawable-nodpi/nature_night_small.jpg b/res_1440p/drawable-nodpi/nature_night_small.jpg
similarity index 100%
rename from res_1440p/common/drawable-nodpi/nature_night_small.jpg
rename to res_1440p/drawable-nodpi/nature_night_small.jpg
Binary files differ
diff --git a/res_1440p/full/drawable-nodpi/nature_sea.jpg b/res_1440p/drawable-nodpi/nature_sea.jpg
similarity index 100%
rename from res_1440p/full/drawable-nodpi/nature_sea.jpg
rename to res_1440p/drawable-nodpi/nature_sea.jpg
Binary files differ
diff --git a/res_1440p/full/drawable-nodpi/nature_sea_small.jpg b/res_1440p/drawable-nodpi/nature_sea_small.jpg
similarity index 100%
rename from res_1440p/full/drawable-nodpi/nature_sea_small.jpg
rename to res_1440p/drawable-nodpi/nature_sea_small.jpg
Binary files differ
diff --git a/res_1440p/full/drawable-nodpi/space_riseup.jpg b/res_1440p/drawable-nodpi/space_riseup.jpg
similarity index 100%
rename from res_1440p/full/drawable-nodpi/space_riseup.jpg
rename to res_1440p/drawable-nodpi/space_riseup.jpg
Binary files differ
diff --git a/res_1440p/full/drawable-nodpi/space_riseup_small.jpg b/res_1440p/drawable-nodpi/space_riseup_small.jpg
similarity index 100%
rename from res_1440p/full/drawable-nodpi/space_riseup_small.jpg
rename to res_1440p/drawable-nodpi/space_riseup_small.jpg
Binary files differ
diff --git a/res_1440p/common/drawable-nodpi/urban_dayroad.jpg b/res_1440p/drawable-nodpi/urban_dayroad.jpg
similarity index 100%
rename from res_1440p/common/drawable-nodpi/urban_dayroad.jpg
rename to res_1440p/drawable-nodpi/urban_dayroad.jpg
Binary files differ
diff --git a/res_1440p/common/drawable-nodpi/urban_dayroad_small.jpg b/res_1440p/drawable-nodpi/urban_dayroad_small.jpg
similarity index 100%
rename from res_1440p/common/drawable-nodpi/urban_dayroad_small.jpg
rename to res_1440p/drawable-nodpi/urban_dayroad_small.jpg
Binary files differ
diff --git a/res_1440p/full/drawable-nodpi/urban_nightroad.jpg b/res_1440p/drawable-nodpi/urban_nightroad.jpg
similarity index 100%
rename from res_1440p/full/drawable-nodpi/urban_nightroad.jpg
rename to res_1440p/drawable-nodpi/urban_nightroad.jpg
Binary files differ
diff --git a/res_1440p/full/drawable-nodpi/urban_nightroad_small.jpg b/res_1440p/drawable-nodpi/urban_nightroad_small.jpg
similarity index 100%
rename from res_1440p/full/drawable-nodpi/urban_nightroad_small.jpg
rename to res_1440p/drawable-nodpi/urban_nightroad_small.jpg
Binary files differ
diff --git a/res_1440p/small/values/arrays.xml b/res_1440p/small/values/arrays.xml
deleted file mode 100644
index 92a3452..0000000
--- a/res_1440p/small/values/arrays.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2020 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="wallpapers" translatable="false">
- <item>abstract_orderofchaos</item>
- <item>nature_ice</item>
- <item>nature_nebula</item>
- <item>nature_night</item>
- <item>urban_dayroad</item>
- </array>
-</resources>
diff --git a/res_1440p/full/values/arrays.xml b/res_1440p/values/arrays.xml
similarity index 100%
rename from res_1440p/full/values/arrays.xml
rename to res_1440p/values/arrays.xml
