Adding dark theme for AddItemActivity

Bug: 117786476
Change-Id: I1a3adb7c10ed2326dc1440c3db15f702f42dbfd8
This commit is contained in:
Sunny Goyal 2018-10-17 11:24:48 -07:00
parent 55ba0dcaaf
commit 367f21999d
5 changed files with 23 additions and 17 deletions

View File

@ -122,7 +122,7 @@
android:value="true" /> android:value="true" />
<activity android:name="com.android.launcher3.dragndrop.AddItemActivity" <activity android:name="com.android.launcher3.dragndrop.AddItemActivity"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" android:theme="@style/AppItemActivityTheme"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:autoRemoveFromRecents="true" android:autoRemoveFromRecents="true"
android:label="@string/action_add_to_workspace" > android:label="@string/action_add_to_workspace" >

View File

@ -44,7 +44,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/colorPrimaryDark" android:background="?android:attr/colorPrimaryDark"
android:theme="@style/WidgetContainerTheme"> android:theme="?attr/widgetsTheme">
<com.android.launcher3.dragndrop.LivePreviewWidgetCell <com.android.launcher3.dragndrop.LivePreviewWidgetCell
android:id="@+id/widget_cell" android:id="@+id/widget_cell"

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
/* /*
* Copyright (C) 2016 The Android Open Source Project * Copyright (C) 2018 The Android Open Source Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,13 +16,11 @@
* limitations under the License. * limitations under the License.
*/ */
--> -->
<resources> <resources>
<style name="LauncherTheme" parent="@style/BaseLauncherThemeWithCustomAttrs"> <style name="AppItemActivityTheme" parent="@android:style/Theme.DeviceDefault.Dialog.Alert">
<item name="android:windowTranslucentStatus">false</item> <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">#00000000</item>
<item name="android:navigationBarColor">#00000000</item>
</style> </style>
</resources> </resources>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
/* /*
* Copyright (C) 2016 The Android Open Source Project * Copyright (C) 2018 The Android Open Source Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,11 +16,11 @@
* limitations under the License. * limitations under the License.
*/ */
--> -->
<resources> <resources>
<style name="LauncherTheme" parent="@style/BaseLauncherThemeWithCustomAttrs"> <style name="AppItemActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<item name="android:windowTranslucentStatus">true</item> <item name="widgetsTheme">@style/WidgetContainerTheme</item>
<item name="android:windowTranslucentNavigation">true</item>
</style> </style>
</resources> </resources>

View File

@ -27,7 +27,7 @@
<item name="android:colorEdgeEffect">#FF757575</item> <item name="android:colorEdgeEffect">#FF757575</item>
</style> </style>
<style name="BaseLauncherThemeWithCustomAttrs" parent="@style/BaseLauncherTheme"> <style name="LauncherTheme" parent="@style/BaseLauncherTheme">
<item name="allAppsScrimColor">#EAFFFFFF</item> <item name="allAppsScrimColor">#EAFFFFFF</item>
<item name="allAppsInterimScrimAlpha">46</item> <item name="allAppsInterimScrimAlpha">46</item>
<item name="allAppsNavBarScrimColor">#66FFFFFF</item> <item name="allAppsNavBarScrimColor">#66FFFFFF</item>
@ -44,9 +44,13 @@
<item name="widgetsTheme">@style/WidgetContainerTheme</item> <item name="widgetsTheme">@style/WidgetContainerTheme</item>
<item name="folderBadgeColor">?android:attr/colorPrimary</item> <item name="folderBadgeColor">?android:attr/colorPrimary</item>
<item name="loadingIconColor">#FFF</item> <item name="loadingIconColor">#FFF</item>
</style>
<style name="LauncherTheme" parent="@style/BaseLauncherThemeWithCustomAttrs"></style> <item name="android:windowTranslucentStatus">false</item>
<item name="android:windowTranslucentNavigation">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">#00000000</item>
<item name="android:navigationBarColor">#00000000</item>
</style>
<style name="LauncherTheme.DarkText" parent="@style/LauncherTheme"> <style name="LauncherTheme.DarkText" parent="@style/LauncherTheme">
<item name="workspaceTextColor">#FF212121</item> <item name="workspaceTextColor">#FF212121</item>
@ -94,6 +98,10 @@
<style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark" /> <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark" />
<style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" /> <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" />
<style name="AppItemActivityTheme" parent="@android:style/Theme.Material.Light.Dialog.Alert">
<item name="widgetsTheme">@style/WidgetContainerTheme</item>
</style>
<!-- <!--
Theme overrides to element on homescreen, i.e., which are drawn on top on wallpaper. Theme overrides to element on homescreen, i.e., which are drawn on top on wallpaper.
Various foreground colors are overridden to be workspaceTextColor so that they are properly Various foreground colors are overridden to be workspaceTextColor so that they are properly