aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add dark widgets theme

Browse Source 
Bug: 62907264
Change-Id: I9831e071eab9a746d1aacab7d023371cc4a631ef
This commit is contained in:
Tony Wickham
2017-06-26 10:48:41 -07:00
parent 03a38a669c
commit 093c3ac7c3
6 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/widgets_bottom_sheet.xml
View File

@@ -22,7 +22,8 @@
android:paddingTop="28dp"
android:background="?android:attr/colorPrimary"
android:elevation="@dimen/deep_shortcuts_elevation"
android:layout_gravity="bottom">
android:layout_gravity="bottom"
android:theme="?attr/widgetsTheme">
<TextView
style="@style/TextTitle"

2
res/layout/widgets_view.xml
View File

@@ -24,7 +24,7 @@
android:layout_height="match_parent"
android:descendantFocusability="afterDescendants"
launcher:revealBackground="@drawable/round_rect_primary"
android:theme="@style/WidgetContainerTheme">
android:theme="?attr/widgetsTheme">
<View
android:id="@+id/reveal_view"

4
res/values-v26/styles.xml
View File

@@ -21,6 +21,10 @@
<style name="WidgetContainerTheme" parent="@android:style/Theme.DeviceDefault.Settings">
<item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
</style>
<style name="WidgetContainerTheme.Dark" parent="LauncherThemeDark">
<item name="android:colorEdgeEffect">?android:attr/textColorSecondary</item>
<item name="android:colorPrimaryDark">#616161</item> <!-- Gray 700 -->
</style>
<!-- From O and above, we show a dark nav bar in all-apps -->
<style name="AllAppsNavBarProtection">

1
res/values/attrs.xml
View File

@@ -30,6 +30,7 @@
<attr name="workspaceAmbientShadowColor" format="color"/>
<attr name="workspaceKeyShadowColor" format="color" />
<attr name="workspaceStatusBarScrim" format="reference" />
<attr name="widgetsTheme" format="reference" />
<!-- BubbleTextView specific attributes. -->
<declare-styleable name="BubbleTextView">

4
res/values/styles.xml
View File

@@ -40,6 +40,7 @@
<item name="workspaceAmbientShadowColor">#33000000</item>
<item name="workspaceKeyShadowColor">#44000000</item>
<item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>
<item name="widgetsTheme">@style/WidgetContainerTheme</item>
</style>
<style name="LauncherTheme" parent="@style/BaseLauncherThemeWithCustomAttrs"></style>
@@ -64,6 +65,7 @@
<item name="popupColorPrimary">?android:attr/colorPrimary</item>
<item name="popupColorSecondary">#424242</item> <!-- Gray 800 -->
<item name="popupColorTertiary">#757575</item> <!-- Gray 600 -->
<item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
<item name="isMainColorDark">true</item>
</style>
@@ -85,6 +87,8 @@
<item name="android:textColorSecondary">?android:attr/textColorSecondaryInverse</item>
</style>
<style name="WidgetContainerTheme.Dark" />
<style name="FastScrollerPopup" >
<item name="android:layout_width">wrap_content</item>
<item name="android:minWidth">@dimen/fastscroll_popup_width</item>

3
src/com/android/launcher3/widget/WidgetsBottomSheet.java
View File

@@ -23,7 +23,6 @@ import android.content.Context;
import android.graphics.Rect;
import android.support.v4.view.animation.FastOutSlowInInterpolator;
import android.util.AttributeSet;
import android.view.ContextThemeWrapper;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -77,7 +76,7 @@ public class WidgetsBottomSheet extends AbstractFloatingView implements Insettab
}
public WidgetsBottomSheet(Context context, AttributeSet attrs, int defStyleAttr) {
super(new ContextThemeWrapper(context, R.style.WidgetContainerTheme), attrs, defStyleAttr);
super(context, attrs, defStyleAttr);
setWillNotDraw(false);
mLauncher = Launcher.getLauncher(context);
mOpenCloseAnimator = LauncherAnimUtils.ofPropertyValuesHolder(this);