From 42ac382af54bbc7bfbdaa7ca65a8c0ad9aeec492 Mon Sep 17 00:00:00 2001
From: Valentin Iftime <valiiftime@google.com>
Date: Wed, 8 Feb 2023 15:14:41 +0100
Subject: [PATCH] Add dimensions for notification channel panel

    Removes dependency on output switcher dimens.
    Fix notification settings bottom sheet scroll in landscape.

Test: adb shell cmd notification post "Test notif" &
    adb shell am start -a android.settings.CHANNEL_NOTIFICATION_SETTINGS     --es android.provider.extra.CHANNEL_FILTER_LIST "sound"     --es android.provider.extra.CHANNEL_ID "shell_cmd"     --es android.provider.extra.APP_PACKAGE "com.android.shell"

Bug: 238845213
Change-Id: Iaf4b52b0aa8376c93ebc55fc005cdb55d2a9620e
---
 res/layout/notification_channel_panel.xml | 4 ++--
 res/values-land/dimens.xml                | 2 +-
 res/values/dimens.xml                     | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/res/layout/notification_channel_panel.xml b/res/layout/notification_channel_panel.xml
index 18e634269b8..fd94707f997 100644
--- a/res/layout/notification_channel_panel.xml
+++ b/res/layout/notification_channel_panel.xml
@@ -16,8 +16,8 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_content"
-    android:layout_height="@dimen/output_switcher_slice_max_height"
-    android:maxHeight="@dimen/output_switcher_slice_max_height"
+    android:layout_height="@dimen/notif_channel_panel_max_height"
+    android:maxHeight="@dimen/notif_channel_panel_max_height"
     android:background="@drawable/settings_panel_background"
     android:orientation="vertical"
     android:layout_width="match_parent">
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index dbf61aca898..fe3e7f610d2 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -32,5 +32,5 @@
     <dimen name="biometric_auth_pattern_view_size">248dp</dimen>
     <dimen name="biometric_auth_pattern_view_max_size">348dp</dimen>
 
-    <dimen name="output_switcher_slice_max_height">300dp</dimen>
+    <dimen name="notif_channel_panel_max_height">300dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index f8d3e5013a2..ba98c307869 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -458,6 +458,9 @@
     <dimen name="output_switcher_panel_icon_size">52dp</dimen>
     <dimen name="output_switcher_panel_icon_corner_radius">16dp</dimen>
 
+    <!-- Notification channels panel related dimensions -->
+    <dimen name="notif_channel_panel_max_height">600dp</dimen>
+
     <!-- Settings panel related dimensions -->
     <dimen name="settings_panel_corner_radius">28dp</dimen>
     <dimen name="settings_panel_title_margin">24dp</dimen>