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

Commit 588a0c71 authored by Andy Mast's avatar Andy Mast
Browse files

Themes: Squashed for caf [3/6] 

Conflicts:
	res/xml/dashboard_categories.xml

Id: I5b88b694db1711302e042a70df663a0a7c0445f8

Expose hardcoded and @android colors from layouts

This will allow theme designers better flexibility with the themes
they design for Settings.  There are probably other resources we
need to expose but this is a good start.

Id: I81254f72cd2d47bc05a7f15c8e3a9fb4c89c8be8

Conflicts:
	res/layout/custom_screencolor.xml
	res/layout/expanded_item.xml
	res/layout/item_row.xml
	res/layout/privacy_guard_manager.xml
	res/layout/screen_color_item.xml
	res/layout/settings_qs_tiles.xml
	res/values/cm_colors.xml

Change-Id: I0c47ed118e59ef18c02e6af5677490d09287f247
parent 2200cc26

res/drawable/ic_settings_themes.xml

0 → 100644
+13 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#039588"

        android:pathData="M21,5V3h-2v6c0,0.6-0.4,1-1,1s-1-0.4-1-1V3h-2v10c0,0.6-0.4,1-1,1s-1-0.4-1-1V7c0-0.6-0.4-1-1-1s-1,0.4-1,1

v4c0,0.6-0.4,1-1,1s-1-0.4-1-1V8c0-0.6-0.4-1-1-1S7,7.4,7,8v8c0,0.6-0.4,1-1,1s-1-0.4-1-1V3H3v2H2v4h1v10c0,1.1,0.9,2,2,2h14

c1.1,0,2-0.9,2-2V9h1V5H21Z" />

</vector>
 
 No newline at end of file

res/layout-land/choose_lock_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
        android:layout_alignParentBottom="true"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="#00000000"

        android:background="@color/background_color_transparent"

        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"

        android:visibility="gone"

    />

res/layout-land/confirm_lock_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
        android:layout_alignParentBottom="true"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="#00000000"

        android:background="@color/background_color_transparent"

        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"

        android:visibility="gone"

    />

res/layout-land/setup_preference.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1"

        android:cacheColorHint="@android:color/transparent"

        android:cacheColorHint="@color/background_color_transparent"

        android:clipToPadding="false"

        android:drawSelectorOnTop="false"

        android:headerDividersEnabled="false"

res/layout-sw600dp-land/choose_lock_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
        android:layout_alignParentBottom="true"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="#00000000"

        android:background="@color/background_color_transparent"

        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"

        android:visibility="gone"

    />