diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-10-17 11:24:48 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-10-17 11:25:40 -0700 |
commit | 367f21999d91065e7f700833d1d6caa386d28954 (patch) | |
tree | 1a91039af8637abacb33acbcdaf3ac14437d388a | |
parent | 55ba0dcaaf65ca6a9ce8f973d100b4619724d3b4 (diff) | |
download | android_packages_apps_Trebuchet-367f21999d91065e7f700833d1d6caa386d28954.tar.gz android_packages_apps_Trebuchet-367f21999d91065e7f700833d1d6caa386d28954.tar.bz2 android_packages_apps_Trebuchet-367f21999d91065e7f700833d1d6caa386d28954.zip |
Adding dark theme for AddItemActivity
Bug: 117786476
Change-Id: I1a3adb7c10ed2326dc1440c3db15f702f42dbfd8
-rw-r--r-- | AndroidManifest-common.xml | 2 | ||||
-rw-r--r-- | res/layout/add_item_confirmation_activity.xml | 2 | ||||
-rw-r--r-- | res/values-night-v26/styles.xml (renamed from res/values-v21/styles.xml) | 14 | ||||
-rw-r--r-- | res/values-v22/styles.xml (renamed from res/values-v19/styles.xml) | 8 | ||||
-rw-r--r-- | res/values/styles.xml | 14 |
5 files changed, 23 insertions, 17 deletions
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index 8f4d5bece..c626615b3 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -122,7 +122,7 @@ android:value="true" /> <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:autoRemoveFromRecents="true" android:label="@string/action_add_to_workspace" > diff --git a/res/layout/add_item_confirmation_activity.xml b/res/layout/add_item_confirmation_activity.xml index 6c316e6ff..830255b6a 100644 --- a/res/layout/add_item_confirmation_activity.xml +++ b/res/layout/add_item_confirmation_activity.xml @@ -44,7 +44,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?android:attr/colorPrimaryDark" - android:theme="@style/WidgetContainerTheme"> + android:theme="?attr/widgetsTheme"> <com.android.launcher3.dragndrop.LivePreviewWidgetCell android:id="@+id/widget_cell" diff --git a/res/values-v21/styles.xml b/res/values-night-v26/styles.xml index 927719cc1..510e1f4cd 100644 --- a/res/values-v21/styles.xml +++ b/res/values-night-v26/styles.xml @@ -1,7 +1,7 @@ <?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"); * you may not use this file except in compliance with the License. @@ -16,13 +16,11 @@ * limitations under the License. */ --> + <resources> - <style name="LauncherTheme" parent="@style/BaseLauncherThemeWithCustomAttrs"> - <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 name="AppItemActivityTheme" parent="@android:style/Theme.DeviceDefault.Dialog.Alert"> + <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item> </style> -</resources> + +</resources>
\ No newline at end of file diff --git a/res/values-v19/styles.xml b/res/values-v22/styles.xml index 36c09718e..f86db7a49 100644 --- a/res/values-v19/styles.xml +++ b/res/values-v22/styles.xml @@ -1,7 +1,7 @@ <?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"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ * limitations under the License. */ --> + <resources> - <style name="LauncherTheme" parent="@style/BaseLauncherThemeWithCustomAttrs"> - <item name="android:windowTranslucentStatus">true</item> - <item name="android:windowTranslucentNavigation">true</item> + <style name="AppItemActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"> + <item name="widgetsTheme">@style/WidgetContainerTheme</item> </style> </resources>
\ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index 098aac562..7b11891a6 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -27,7 +27,7 @@ <item name="android:colorEdgeEffect">#FF757575</item> </style> - <style name="BaseLauncherThemeWithCustomAttrs" parent="@style/BaseLauncherTheme"> + <style name="LauncherTheme" parent="@style/BaseLauncherTheme"> <item name="allAppsScrimColor">#EAFFFFFF</item> <item name="allAppsInterimScrimAlpha">46</item> <item name="allAppsNavBarScrimColor">#66FFFFFF</item> @@ -44,9 +44,13 @@ <item name="widgetsTheme">@style/WidgetContainerTheme</item> <item name="folderBadgeColor">?android:attr/colorPrimary</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"> <item name="workspaceTextColor">#FF212121</item> @@ -94,6 +98,10 @@ <style name="AppTheme.Dark" parent="@style/LauncherTheme.Dark" /> <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. Various foreground colors are overridden to be workspaceTextColor so that they are properly |