diff options
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/attrs.xml | 4 | ||||
-rw-r--r-- | res/values/styles.xml | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 43194d5cb..69b8c8a22 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -36,8 +36,10 @@ <attr name="loadingIconColor" format="color" /> <attr name="folderDotColor" format="color" /> + <attr name="folderFillColor" format="color" /> <attr name="folderIconRadius" format="float" /> <attr name="folderIconBorderColor" format="color" /> + <attr name="folderTextColor" format="color" /> <!-- BubbleTextView specific attributes. --> <declare-styleable name="BubbleTextView"> @@ -55,7 +57,7 @@ <!-- BubbleTextView specific attributes. --> <declare-styleable name="FolderIconPreview"> - <attr name="android:colorPrimary" /> + <attr name="folderFillColor" /> <attr name="folderIconBorderColor" /> <attr name="folderDotColor" /> </declare-styleable> diff --git a/res/values/styles.xml b/res/values/styles.xml index 7932c6d60..8116e30ef 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -26,6 +26,7 @@ <item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowNoTitle">true</item> <item name="android:windowShowWallpaper">true</item> + <item name="folderTextColor">?attr/workspaceTextColor</item> </style> <style name="LauncherTheme" parent="@style/BaseLauncherTheme"> @@ -44,7 +45,9 @@ <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item> <item name="widgetsTheme">@style/WidgetContainerTheme</item> <item name="folderDotColor">?android:attr/colorPrimary</item> + <item name="folderFillColor">#CDFFFFFF</item> <item name="folderIconBorderColor">?android:attr/colorPrimary</item> + <item name="folderTextColor">#FF212121</item> <item name="loadingIconColor">#CCFFFFFF</item> <item name="android:windowTranslucentStatus">false</item> @@ -54,6 +57,11 @@ <item name="android:navigationBarColor">#00000000</item> </style> + <style name="LauncherTheme.DarkMainColor" parent="@style/LauncherTheme"> + <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 --> + <item name="folderTextColor">?attr/workspaceTextColor</item> + </style> + <style name="LauncherTheme.DarkText" parent="@style/LauncherTheme"> <item name="workspaceTextColor">#FF212121</item> <item name="allAppsInterimScrimAlpha">128</item> @@ -63,7 +71,9 @@ <item name="isWorkspaceDarkText">true</item> <item name="workspaceStatusBarScrim">@null</item> <item name="folderDotColor">#FF464646</item> + <item name="folderFillColor">#CDFFFFFF</item> <item name="folderIconBorderColor">#FF80868B</item> + <item name="folderTextColor">?attr/workspaceTextColor</item> </style> <style name="LauncherTheme.Dark" parent="@style/LauncherTheme"> @@ -81,13 +91,22 @@ <item name="popupColorTertiary">#757575</item> <!-- Gray 600 --> <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item> <item name="folderDotColor">#FF464646</item> + <item name="folderFillColor">#DD3C4043</item> <!-- 87% GM2 800 --> <item name="folderIconBorderColor">#FF80868B</item> + <item name="folderTextColor">@android:color/white</item> <item name="isMainColorDark">true</item> <item name="loadingIconColor">#99FFFFFF</item> </style> + <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark"> + <item name="folderFillColor">#FF3C4043</item> <!-- 100% GM2 800 --> + <item name="folderTextColor">@android:color/white</item> + </style> + <style name="LauncherTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark"> <item name="allAppsInterimScrimAlpha">25</item> + <item name="folderFillColor">#CDFFFFFF</item> + <item name="folderTextColor">?attr/workspaceTextColor</item> <item name="workspaceTextColor">#FF212121</item> <item name="workspaceShadowColor">@android:color/transparent</item> <item name="workspaceAmbientShadowColor">@android:color/transparent</item> @@ -99,8 +118,11 @@ <!-- A derivative project can extend these themes to customize the application theme without affecting the base theme --> <style name="AppTheme" parent="@style/LauncherTheme" /> + <style name="AppTheme.DarkMainColor" parent="@style/LauncherTheme.DarkMainColor" /> <style name="AppTheme.DarkText" parent="@style/LauncherTheme.DarkText" /> + <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark" /> + <style name="AppTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark.DarkMainColor" /> <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" /> <style name="AppItemActivityTheme" parent="@android:style/Theme.Material.Light.Dialog.Alert"> @@ -157,7 +179,7 @@ <item name="android:shadowRadius">0</item> </style> - <!-- Icon displayed on the worksapce --> + <!-- Icon displayed on the workspace --> <style name="BaseIcon.Workspace" > <item name="android:shadowRadius">2.0</item> <item name="android:shadowColor">?attr/workspaceShadowColor</item> |