From 5455bb540a8b4a5150a1b790c4a36fb0410f8ac3 Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Thu, 5 Mar 2015 20:05:31 +0100
Subject: [PATCH] Ensure redaction settings are visible on narrow screens

Bug: 18599040
Change-Id: I852f8fa317927f6f786b33f965e9d1feab562518
---
 res/layout/redaction_interstitial.xml | 10 +++++-----
 res/values-h330dp/dimens.xml          | 20 ++++++++++++++++++++
 res/values/dimens.xml                 |  3 +++
 3 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 res/values-h330dp/dimens.xml

diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index c56db11ee80..6f0ba2ee17a 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -26,7 +26,7 @@
     <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/redaction_vertical_margins"
             android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
             android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
             android:text="@string/lock_screen_notifications_interstitial_message"
@@ -35,7 +35,7 @@
     <RadioGroup
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/redaction_vertical_margins"
             android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
             android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
             android:checkedButton="@+id/redact_sensitive">
@@ -44,21 +44,21 @@
                 android:id="@+id/show_all"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/redaction_vertical_margins"
                 android:text="@string/lock_screen_notifications_summary_show" />
 
         <RadioButton
                 android:id="@+id/redact_sensitive"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/redaction_vertical_margins"
                 android:text="@string/lock_screen_notifications_summary_hide" />
 
         <RadioButton
                 android:id="@+id/hide_all"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/redaction_vertical_margins"
                 android:text="@string/lock_screen_notifications_summary_disable" />
 
     </RadioGroup>
diff --git a/res/values-h330dp/dimens.xml b/res/values-h330dp/dimens.xml
new file mode 100644
index 00000000000..eae966091de
--- /dev/null
+++ b/res/values-h330dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- RedactionInterstitial -->
+    <dimen name="redaction_vertical_margins">16dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8f440ef6f5f..a494db95772 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -230,4 +230,7 @@
     <dimen name="color_swatch_size">16dp</dimen>
     <dimen name="color_swatch_stroke_width">4dp</dimen>
 
+    <!-- RedactionInterstitial -->
+    <dimen name="redaction_vertical_margins">8dp</dimen>
+
 </resources>