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

Commit 9717fab5 authored by Christoph Studer's avatar Christoph Studer
Browse files

NotificationStation: Fix crash, use dark theme 

Bug: 15899979
Change-Id: Ieaa65e300cdc9cbed83b601b7a972a1e245c4961
parent cfc7f9d9

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ 
        </activity>



        <activity android:name="Settings$NotificationStationActivity"

                android:theme="@android:style/Theme.DeviceDefault"

                android:theme="@style/Theme.NotificationStation"

                android:label="@string/notification_log_title"

                android:taskAffinity="">

            <intent-filter>

res/layout/notification_log_row.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
    android:layout_height="wrap_content"

    android:paddingBottom="6dp"

    android:paddingTop="6dp"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:orientation="vertical"

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

    >

res/layout/settings_main.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
              android:orientation="vertical"

              android:layout_height="match_parent"

              android:layout_width="match_parent"

              android:background="@color/dashboard_background_color">

              android:background="?attr/dashboardBackgroundColor">



    <LinearLayout

            android:orientation="vertical"

res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -100,4 +100,5 @@ 
    <attr name="switchBarMarginStart" format="dimension" />

    <attr name="switchBarMarginEnd" format="dimension" />



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

</resources>

res/values/themes.xml

+8 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
        <item name="switchBarMarginStart">0dip</item>

        <item name="switchBarMarginEnd">0dip</item>

        <item name="wifi_signal">@drawable/wifi_signal_dark</item>

        <item name="dashboardBackgroundColor">@color/dashboard_background_color</item>

    </style>



    <style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
@@ -51,6 +52,7 @@ 
        <item name="switchBarMarginStart">0dip</item>

        <item name="switchBarMarginEnd">0dip</item>

        <item name="wifi_signal">@drawable/wifi_signal_light</item>

        <item name="dashboardBackgroundColor">@color/dashboard_background_color</item>

    </style>



    <style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">
@@ -94,6 +96,7 @@ 


        <item name="switchBarMarginStart">@dimen/switchbar_margin_start</item>

        <item name="switchBarMarginEnd">@dimen/switchbar_margin_end</item>

        <item name="dashboardBackgroundColor">@color/dashboard_background_color</item>



        <!-- Redefine the ActionBar style for contentInsetStart -->

        <item name="android:actionBarStyle">@style/Theme.ActionBar</item>
@@ -161,4 +164,9 @@ 
        <item name="android:actionBarStyle">@style/Theme.ActionBar</item>

    </style>



    <style name="Theme.NotificationStation" parent="@android:style/Theme.Material">

        <item name="switchBarMarginStart">0dip</item>

        <item name="switchBarMarginEnd">0dip</item>

        <item name="dashboardBackgroundColor">@android:color/transparent</item>

    </style>

</resources>