PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258697

Change-Id: I037e2315a6ce8871182aa8c50b12ae15a087a8d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Edgar Wang
2023-05-16 12:23:26 +00:00
committed by Automerger Merge Worker
parent fff8a890cd 9b95a077b9
commit ba347ac106
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -3717,7 +3717,7 @@
<!-- Show channel-level notification settings (channel passed in as extras) --> <!-- Show channel-level notification settings (channel passed in as extras) -->
<activity android:name=".notification.app.ChannelPanelActivity" <activity android:name=".notification.app.ChannelPanelActivity"
android:label="@string/notification_channel_title" android:label="@string/notification_channel_title"
android:theme="@style/Theme.Panel" android:theme="@style/Theme.Panel.Material"
android:excludeFromRecents="true" android:excludeFromRecents="true"
android:configChanges="keyboardHidden|screenSize" android:configChanges="keyboardHidden|screenSize"
android:exported="true"> android:exported="true">

3
res/drawable/button_border_selected.xml
View File

@@ -15,10 +15,7 @@
limitations under the License. limitations under the License.
--> -->
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid
android:color="?androidprv:attr/materialColorSurfaceContainer" />
<stroke <stroke
android:width="2dp" android:width="2dp"
android:color="?android:attr/colorAccent"/> android:color="?android:attr/colorAccent"/>

2
res/drawable/button_border_unselected.xml
View File

@@ -18,7 +18,7 @@
android:shape="rectangle"> android:shape="rectangle">
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/notification_importance_button_unselected"/> android:color="?android:attr/colorAccent"/>
<corners android:radius="@dimen/rect_button_radius" /> <corners android:radius="@dimen/rect_button_radius" />
</shape> </shape>

3
res/values/themes.xml
View File

@@ -227,6 +227,9 @@
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style> </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 --> <!-- Material theme for the pages containing TabLayout and ViewPager -->
<style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight"> <style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
<item name="colorPrimary">@*android:color/edge_effect_device_default_light</item> <item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>