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

Commit 3d3c41a3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make educational half-sheet black in dark mode" into ub-launcher3-rvc-dev

parents eb0136b7 1012fd23

quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 
    <View

        android:layout_width="match_parent"

        android:layout_height="32dp"

        android:backgroundTint="?android:attr/colorAccent"

        android:backgroundTint="?attr/eduHalfSheetBGColor"

        android:background="@drawable/bottom_sheet_top_border" />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?android:attr/colorAccent"

        android:background="?attr/eduHalfSheetBGColor"

        android:orientation="vertical">



        <TextView

res/layout/work_profile_edu.xml

+2 −2
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 
        android:layout_width="match_parent"

        android:layout_height="32dp"

        android:background="@drawable/bottom_sheet_top_border"

        android:backgroundTint="?android:attr/colorAccent" />

        android:backgroundTint="?attr/eduHalfSheetBGColor" />



    <LinearLayout

        android:id="@+id/view_wrapper"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?android:attr/colorAccent"

        android:background="?attr/eduHalfSheetBGColor"

        android:orientation="vertical"

        android:paddingLeft="@dimen/bottom_sheet_edu_padding"

        android:paddingRight="@dimen/bottom_sheet_edu_padding">

res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
    <attr name="widgetsTheme" format="reference" />

    <attr name="loadingIconColor" format="color" />

    <attr name="iconOnlyShortcutColor" format="color"/>

    <attr name="eduHalfSheetBGColor" format="color"/>



    <attr name="folderDotColor" format="color" />

    <attr name="folderFillColor" format="color" />

res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
        <item name="loadingIconColor">#CCFFFFFF</item>

        <item name="iconOnlyShortcutColor">?android:attr/textColorSecondary</item>

        <item name="workProfileOverlayTextColor">#FF212121</item>

        <item name="eduHalfSheetBGColor">?android:attr/colorAccent</item>



        <item name="android:windowTranslucentStatus">false</item>

        <item name="android:windowTranslucentNavigation">false</item>
@@ -106,6 +107,7 @@ 
        <item name="loadingIconColor">#99FFFFFF</item>

        <item name="iconOnlyShortcutColor">#B3FFFFFF</item>

        <item name="workProfileOverlayTextColor">@android:color/white</item>

        <item name="eduHalfSheetBGColor">#DD000000</item>

    </style>



    <style name="LauncherTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark">