From 1092539bbe7c2b36a7a927ffbdd28dcccf0b2f64 Mon Sep 17 00:00:00 2001
From: Christopher Lane <lanechr@google.com>
Date: Tue, 4 Nov 2014 17:06:41 -0800
Subject: Replace font size customization with a max width for the welcome
 message

Bug: 18193912
Change-Id: I25203aaa937d3d99bf69bd5c15c6652cdde584e0
---
 apps/SetupCustomizer/res/values-de/strings.xml | 4 ++++
 apps/SetupCustomizer/res/values/colors.xml     | 4 ----
 apps/SetupCustomizer/res/values/dimens.xml     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 apps/SetupCustomizer/res/values-de/strings.xml
 delete mode 100644 apps/SetupCustomizer/res/values/colors.xml

(limited to 'apps')

diff --git a/apps/SetupCustomizer/res/values-de/strings.xml b/apps/SetupCustomizer/res/values-de/strings.xml
new file mode 100644
index 0000000..2794b47
--- /dev/null
+++ b/apps/SetupCustomizer/res/values-de/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <!-- Welcome message -->
+    <string name="welcome_message">a really really long welcome message, because german</string>
+</resources>
diff --git a/apps/SetupCustomizer/res/values/colors.xml b/apps/SetupCustomizer/res/values/colors.xml
deleted file mode 100644
index 810e40e..0000000
--- a/apps/SetupCustomizer/res/values/colors.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="partner_color">#FFFF00FF</color>
-</resources>
diff --git a/apps/SetupCustomizer/res/values/dimens.xml b/apps/SetupCustomizer/res/values/dimens.xml
index d2e8f3e..6907661 100644
--- a/apps/SetupCustomizer/res/values/dimens.xml
+++ b/apps/SetupCustomizer/res/values/dimens.xml
@@ -2,10 +2,10 @@
 <!-- Copyright 2012-2014 Google Inc. All Rights Reserved. -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Welcome text font size; can use dp, sp, pt, etc. -->
-    <dimen name="welcome_font_size">12sp</dimen>
+    <!-- Max width for welcome text (default: 536dp) -->
+    <dimen name="welcome_message_max_width">400dp</dimen>
 
-    <!-- Offset (positive or negative) for the welcome message -->
+    <!-- Offset (positive or negative) for the welcome message (default: 0) -->
     <dimen name="welcome_message_offset">-100dp</dimen>
 
 </resources>
-- 
cgit v1.2.3