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

Commit 63d5209b authored by Linda Tseng's avatar Linda Tseng Committed by android-build-merger
Browse files

Merge "Make panel support dark mode" into qt-dev am: 395cad38 

am: f55d2a0b

Change-Id: I0d93233751b66f54dddf3ff03df53b6e7ddd89e7
parents 7fd731f8 f55d2a0b

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -3095,7 +3095,7 @@ 


        <activity android:name=".panel.SettingsPanelActivity"

            android:label="@string/settings_panel_title"

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

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

            android:documentLaunchMode="always"

            android:excludeFromRecents="true"

            android:exported="true">

res/layout/panel_layout.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
            android:gravity="center"

            android:paddingBottom="24dp"

            android:paddingTop="18dp"

            android:textColor="?android:attr/colorPrimary"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="20sp"/>



        <include layout="@layout/horizontal_divider"/>

res/values/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ 
    </style>



    <!-- Note that Dialog themes do not set list dividers -->

    <style name="Theme.BottomDialog" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog">

    <style name="Theme.Panel" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog">

        <item name="android:windowBackground">@null</item>

        <item name="android:dividerHorizontal">@*android:drawable/list_divider_material</item>

        <item name="android:windowNoTitle">true</item>