Merge "Add a config to hide the 3G option at preferred network mode UI" into tm-qpr-dev
diff --git a/res/layout/notification_channel_panel.xml b/res/layout/notification_channel_panel.xml
index 18e6342..fd94707 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 dbf61ac..fe3e7f6 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 f8d3e50..ba98c30 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>