From 1e81f6eb953d738b64870967db4c89dcaa26313a Mon Sep 17 00:00:00 2001
From: Valentin Iftime <valiiftime@google.com>
Date: Mon, 30 Jan 2023 10:44:37 +0100
Subject: [PATCH] Fix notification settings bottom sheet scroll in landscape

    Fix layout size and configuration listener for landscape orientation.

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: I6c2ba149cddfdf35292b0b6fc92c0d8418a86c54
---
 AndroidManifest.xml                       | 2 +-
 res/layout/notification_channel_panel.xml | 1 +
 res/values-land/dimens.xml                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bea9a3c7aa1..f81a97ff1b0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3408,7 +3408,7 @@
                   android:label="@string/notification_channel_title"
                   android:theme="@style/Theme.Panel"
                   android:excludeFromRecents="true"
-                  android:configChanges="orientation|keyboardHidden|screenSize"
+                  android:configChanges="keyboardHidden|screenSize"
                   android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CHANNEL_NOTIFICATION_SETTINGS" />
diff --git a/res/layout/notification_channel_panel.xml b/res/layout/notification_channel_panel.xml
index 49cd95c25d3..18e634269b8 100644
--- a/res/layout/notification_channel_panel.xml
+++ b/res/layout/notification_channel_panel.xml
@@ -17,6 +17,7 @@
     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: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 39424302e2b..dbf61aca898 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -32,4 +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>
 </resources>