From 816c0ba94742fe308a211a1965ca03e58c55fac9 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 2 Dec 2013 20:33:53 +0900
Subject: [PATCH] Rename config resource name to be matched with attribute name

This is a followup of I6fb11b8cb5.

Change-Id: I2a78affabf278e13fdeb2d4fcb0e5d26fb748a8b
---
 java/res/values-land/config.xml         | 2 +-
 java/res/values-sw540dp-land/config.xml | 2 +-
 java/res/values-sw540dp/config.xml      | 2 +-
 java/res/values-sw768dp-land/config.xml | 2 +-
 java/res/values-sw768dp/config.xml      | 2 +-
 java/res/values/config.xml              | 2 +-
 java/res/values/themes-common.xml       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/res/values-land/config.xml b/java/res/values-land/config.xml
index 6cf165696..b6ef4a7ad 100644
--- a/java/res/values-land/config.xml
+++ b/java/res/values-land/config.xml
@@ -47,7 +47,7 @@
     <fraction name="config_key_label_ratio">40%</fraction>
     <fraction name="config_key_hint_letter_ratio">30%</fraction>
     <fraction name="config_key_hint_label_ratio">52%</fraction>
-    <fraction name="config_key_uppercase_letter_ratio">40%</fraction>
+    <fraction name="config_key_shifted_letter_hint_ratio">40%</fraction>
     <fraction name="config_key_preview_text_ratio">90%</fraction>
     <fraction name="config_language_on_spacebar_text_ratio">40.000%</fraction>
     <dimen name="config_key_preview_offset_gb">0.0dp</dimen>
diff --git a/java/res/values-sw540dp-land/config.xml b/java/res/values-sw540dp-land/config.xml
index 2f578879a..55dcd5145 100644
--- a/java/res/values-sw540dp-land/config.xml
+++ b/java/res/values-sw540dp-land/config.xml
@@ -47,7 +47,7 @@
     <fraction name="config_key_label_ratio">32%</fraction>
     <fraction name="config_key_hint_letter_ratio">23%</fraction>
     <fraction name="config_key_hint_label_ratio">34%</fraction>
-    <fraction name="config_key_uppercase_letter_ratio">29%</fraction>
+    <fraction name="config_key_shifted_letter_hint_ratio">29%</fraction>
     <fraction name="config_language_on_spacebar_text_ratio">30.0%</fraction>
     <dimen name="config_key_shifted_letter_hint_padding">4dp</dimen>
 
diff --git a/java/res/values-sw540dp/config.xml b/java/res/values-sw540dp/config.xml
index b6d1104b5..8d0b7f4e1 100644
--- a/java/res/values-sw540dp/config.xml
+++ b/java/res/values-sw540dp/config.xml
@@ -70,7 +70,7 @@
     <fraction name="config_key_large_label_ratio">32%</fraction>
     <fraction name="config_key_hint_letter_ratio">23%</fraction>
     <fraction name="config_key_hint_label_ratio">28%</fraction>
-    <fraction name="config_key_uppercase_letter_ratio">22%</fraction>
+    <fraction name="config_key_shifted_letter_hint_ratio">22%</fraction>
     <fraction name="config_key_preview_text_ratio">50%</fraction>
     <fraction name="config_language_on_spacebar_text_ratio">28.0%</fraction>
     <dimen name="config_key_preview_height">94.5dp</dimen>
diff --git a/java/res/values-sw768dp-land/config.xml b/java/res/values-sw768dp-land/config.xml
index 716fcdd97..b27d4c057 100644
--- a/java/res/values-sw768dp-land/config.xml
+++ b/java/res/values-sw768dp-land/config.xml
@@ -47,7 +47,7 @@
     <fraction name="config_key_label_ratio">28%</fraction>
     <fraction name="config_key_hint_letter_ratio">23%</fraction>
     <fraction name="config_key_hint_label_ratio">28%</fraction>
-    <fraction name="config_key_uppercase_letter_ratio">24%</fraction>
+    <fraction name="config_key_shifted_letter_hint_ratio">24%</fraction>
     <fraction name="config_language_on_spacebar_text_ratio">24.00%</fraction>
     <dimen name="config_key_preview_height">107.1dp</dimen>
 
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index 112775c61..bc6feba04 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -70,7 +70,7 @@
     <fraction name="config_key_large_label_ratio">28%</fraction>
     <fraction name="config_key_hint_letter_ratio">23%</fraction>
     <fraction name="config_key_hint_label_ratio">28%</fraction>
-    <fraction name="config_key_uppercase_letter_ratio">26%</fraction>
+    <fraction name="config_key_shifted_letter_hint_ratio">26%</fraction>
     <fraction name="config_key_preview_text_ratio">50%</fraction>
     <fraction name="config_language_on_spacebar_text_ratio">29.03%</fraction>
     <dimen name="config_key_preview_height">94.5dp</dimen>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index 87de57ad7..2c56651db 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -136,7 +136,7 @@
     <fraction name="config_key_large_label_ratio">40%</fraction>
     <fraction name="config_key_hint_letter_ratio">25%</fraction>
     <fraction name="config_key_hint_label_ratio">44%</fraction>
-    <fraction name="config_key_uppercase_letter_ratio">35%</fraction>
+    <fraction name="config_key_shifted_letter_hint_ratio">35%</fraction>
     <fraction name="config_key_preview_text_ratio">82%</fraction>
     <fraction name="config_language_on_spacebar_text_ratio">33.735%</fraction>
     <dimen name="config_key_preview_height">80dp</dimen>
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index be15d52b3..7c9b51c0a 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -37,7 +37,7 @@
         <item name="keyLargeLabelRatio">@fraction/config_key_large_label_ratio</item>
         <item name="keyHintLetterRatio">@fraction/config_key_hint_letter_ratio</item>
         <item name="keyHintLabelRatio">@fraction/config_key_hint_label_ratio</item>
-        <item name="keyShiftedLetterHintRatio">@fraction/config_key_uppercase_letter_ratio</item>
+        <item name="keyShiftedLetterHintRatio">@fraction/config_key_shifted_letter_hint_ratio</item>
         <item name="keyTypeface">normal</item>
         <item name="keyLabelHorizontalPadding">@dimen/config_key_label_horizontal_padding</item>
         <item name="keyHintLetterPadding">@dimen/config_key_hint_letter_padding</item>