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

Commit 2917c0c1 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Revert "Revert "Update theme for ChannelPanelActivity"" 

This reverts commit bbef903b.

Reason for revert: This CL is fixing notification panel theme issue.

Change-Id: I6bcd8c8f1e8d2f2bd2f7896ebf45d36f67f570b9
parent bbef903b

AndroidManifest.xml

+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">

res/drawable/button_border_selected.xml

+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"/>

res/drawable/button_border_unselected.xml

+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>

res/values/themes.xml

+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>