restart / icons

2023-12-05 13:51:56 +01:00 · 2023-12-05 13:51:56 +01:00 · c06e0b4d6b
parent b974ef33f8
commit c06e0b4d6b
16 changed files with 0 additions and 6 deletions
--- a/app/src/main/res/drawable-hdpi/duckduckgo1.jpg
+++ b/app/src/main/res/drawable-hdpi/duckduckgo1.jpg
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -271,15 +271,9 @@
    <string name="SETTING_SEARCH_HEADER_2" translatable="true">Search setting</string>
    <string name="SETTING_SEARCH_HEADER_2_INFO" translatable="true">Manage how searches appear</string>
    <string name="SETTING_SEARCH_DEFAULT" translatable="false">Default Engine (Recommended)</string>
-<<<<<<< HEAD
-    <string name="SETTING_SEARCH_GENESIS" translatable="false">Orion</string>
    <string name="SETTING_SEARCH_DUCK" translatable="false">Duckduckgo (Recommended)</string>
    <string name="SETTING_SEARCH_GOOGLE" translatable="false">Google by Google inc</string>
-=======
    <string name="SETTING_SEARCH_GENESIS" translatable="false">LeOSium</string>
-    <string name="SETTING_SEARCH_DUCK" translatable="false">Torry IO (Recommended)</string>
-    <string name="SETTING_SEARCH_GOOGLE" translatable="false">Search by Harvey186</string>
->>>>>>> origin/v1.6.1
    <string name="SETTING_SEARCH_AMAZON" translatable="false">Bing by Microsoft</string>
    <string name="SETTING_SEARCH_BING" translatable="false">Browse articles freely</string>
    <string name="SETTING_SEARCH_HISTORY" translatable="true">Show search history</string>