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

Commit bbef903b authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Revert "Update theme for ChannelPanelActivity" 

This reverts commit 41eeb31b.

Reason for revert: b/284380876

Change-Id: Ia06bf047db187091753e560f70427abb5b26378a
parent 41eeb31b

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.Material"

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

                  android:excludeFromRecents="true"

                  android:configChanges="keyboardHidden|screenSize"

                  android:exported="true">

res/drawable/button_border_selected.xml

+3 −0
Original line number Diff line number Diff line
@@ -15,7 +15,10 @@ 
  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="?android:attr/colorAccent"/>

        android:color="@color/notification_importance_button_unselected"/>



    <corners android:radius="@dimen/rect_button_radius" />

</shape>

res/values/themes.xml

+0 −3
Original line number Diff line number Diff line
@@ -227,9 +227,6 @@ 
        <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>