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

Commit ba347ac1 authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Update theme for ChannelPanelActivity" into udc-dev am: 9b95a077

parents fff8a890 9b95a077
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3717,7 +3717,7 @@
        <!-- Show channel-level notification settings (channel passed in as extras) -->
        <activity android:name=".notification.app.ChannelPanelActivity"
                  android:label="@string/notification_channel_title"
                  android:theme="@style/Theme.Panel"
                  android:theme="@style/Theme.Panel.Material"
                  android:excludeFromRecents="true"
                  android:configChanges="keyboardHidden|screenSize"
                  android:exported="true">
+0 −3
Original line number Diff line number Diff line
@@ -15,10 +15,7 @@
  limitations under the License.
  -->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
       android:shape="rectangle">
    <solid
        android:color="?androidprv:attr/materialColorSurfaceContainer" />
    <stroke
        android:width="2dp"
        android:color="?android:attr/colorAccent"/>
+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@
       android:shape="rectangle">
    <stroke
        android:width="1dp"
        android:color="@color/notification_importance_button_unselected"/>
        android:color="?android:attr/colorAccent"/>

    <corners android:radius="@dimen/rect_button_radius" />
</shape>
+3 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@
        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
    </style>

    <style name="Theme.Panel.Material" parent="Theme.Panel" >
        <item name="android:switchStyle">@style/Switch.SettingsLib</item>
    </style>
    <!-- Material theme for the pages containing TabLayout and ViewPager -->
    <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
        <item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>