From 5df01f1d09550e09059228dfd5552f907b3016f7 Mon Sep 17 00:00:00 2001 From: Fahim Date: Fri, 10 Dec 2021 10:29:29 +0600 Subject: [PATCH] 4366-Q-UI_revamp issue: https://gitlab.e.foundation/e/backlog/-/issues/4366 --- Android.bp | 3 ++- res/layout/search_intent_item.xml | 1 - res/layout/search_panel.xml | 1 - res/layout/search_saved_query_item.xml | 1 - res/values-night/{colors.xml => bools.xml} | 2 +- res/values/bools.xml | 19 ++++++++++++++ res/values/colors.xml | 11 ++++++-- res/values/themes.xml | 30 +++++++++++++++++++++- 8 files changed, 60 insertions(+), 8 deletions(-) rename res/values-night/{colors.xml => bools.xml} (89%) create mode 100644 res/values/bools.xml diff --git a/Android.bp b/Android.bp index fc8062a..f1a7dc1 100644 --- a/Android.bp +++ b/Android.bp @@ -17,7 +17,6 @@ android_app { optimize: { proguard_flags_files: ["proguard.cfg"], }, - sdk_version: "system_current", product_specific: true, privileged: true, required: ["privapp_whitelist_com.android.settings.intelligence"], @@ -30,6 +29,7 @@ android_app { "androidx.preference_preference", "androidx.recyclerview_recyclerview", "androidx.legacy_legacy-preference-v14", + "org.lineageos.platform.sdk", ], resource_dirs: ["res"], srcs: [ @@ -39,4 +39,5 @@ android_app { proto: { type: "nano", }, + platform_apis: true, } diff --git a/res/layout/search_intent_item.xml b/res/layout/search_intent_item.xml index 6bc00ad..e188182 100644 --- a/res/layout/search_intent_item.xml +++ b/res/layout/search_intent_item.xml @@ -22,7 +22,6 @@ android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:background="?android:attr/selectableItemBackground" android:clipToPadding="false"> diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml index 82b1e11..cb9b782 100644 --- a/res/layout/search_panel.xml +++ b/res/layout/search_panel.xml @@ -38,7 +38,6 @@ android:id="@+id/search_toolbar" android:layout_width="match_parent" android:layout_height="@dimen/search_bar_height" - android:background="?android:attr/selectableItemBackground" android:contentInsetStart="0dp" android:contentInsetStartWithNavigation="0dp" android:theme="?android:attr/actionBarTheme"> diff --git a/res/layout/search_saved_query_item.xml b/res/layout/search_saved_query_item.xml index f8c239a..44d46e0 100644 --- a/res/layout/search_saved_query_item.xml +++ b/res/layout/search_saved_query_item.xml @@ -21,7 +21,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:background="?android:attr/selectableItemBackground" android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical"> diff --git a/res/values-night/colors.xml b/res/values-night/bools.xml similarity index 89% rename from res/values-night/colors.xml rename to res/values-night/bools.xml index 399913a..f8bf923 100644 --- a/res/values-night/colors.xml +++ b/res/values-night/bools.xml @@ -15,5 +15,5 @@ --> - @*android:color/material_grey_800 + false diff --git a/res/values/bools.xml b/res/values/bools.xml new file mode 100644 index 0000000..f6804fe --- /dev/null +++ b/res/values/bools.xml @@ -0,0 +1,19 @@ + + + + + true + diff --git a/res/values/colors.xml b/res/values/colors.xml index 632c72d..6f28967 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -16,7 +16,14 @@ --> - #ff008577 + @lineageos.platform:color/color_default_primary + @lineageos.platform:color/color_default_primary_dark + @lineageos.platform:color/color_default_accent + @lineageos.platform:color/color_default_background + @lineageos.platform:color/color_default_primary_text + @lineageos.platform:color/color_default_secondary_text - @android:color/white + @color/color_default_accent + + @color/color_default_background diff --git a/res/values/themes.xml b/res/values/themes.xml index 4e8ae4e..922ecec 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -16,10 +16,38 @@ --> - \ No newline at end of file -- GitLab