From 4c44359d91c4b364a650799e93580eb5a066de7f Mon Sep 17 00:00:00 2001
From: Adam Lesinski <adamlesinski@google.com>
Date: Fri, 12 Feb 2016 23:51:28 -0800
Subject: [PATCH] Fix up some small resource issues

- the "save" string is a duplicate, and is overriden by the next definition below it.
  Due to the way AAPT handles overlays, this was accepted.
- the style attribute should not start with '@'.
- the 'raw' type is reserved for file references. Values should not be 'raw'.

Change-Id: Id611d5915207ce624d7a743b5d79bbb1258d3d51
---
 packages/SystemUI/res/values/strings.xml                      | 1 -
 packages/SystemUI/res/values/styles.xml                       | 2 +-
 packages/SystemUI/res/values/values_tv.xml                    | 4 ++--
 .../systemui/recents/tv/animations/ViewFocusAnimator.java     | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 5e8c12310bb04..94d658a789fab 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -1190,7 +1190,6 @@
          settings are -->
     <string name="experimental">Experimental</string>
 
-    <string name="save" translatable="false">Save</string>
     <string name="qs_customize" translatable="false">Allow long-press customize in Quick Settings</string>
     <string name="qs_customize_info" translatable="false">Info</string>
     <string name="qs_customize_remove" translatable="false">Remove</string>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 60a9fc233aa36..a51b9317db6a4 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -300,7 +300,7 @@
     </style>
 
     <style name="TunerPreferenceTheme" parent="@android:style/Theme.Material.Settings">
-        <item name="@dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>
+        <item name="dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>
     </style>
 
     <style name="TextAppearance.NotificationGuts">
diff --git a/packages/SystemUI/res/values/values_tv.xml b/packages/SystemUI/res/values/values_tv.xml
index 45cdc07c65ae9..1fcc9e4a9d7ef 100644
--- a/packages/SystemUI/res/values/values_tv.xml
+++ b/packages/SystemUI/res/values/values_tv.xml
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <item format="float" type="raw" name="unselected_scale">1.0</item>
-</resources>
\ No newline at end of file
+    <item format="float" type="integer" name="unselected_scale">1.0</item>
+</resources>
diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java
index 8028327efe2e5..48a1904c03b11 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java
@@ -47,7 +47,7 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener {
         mTargetView.setOnFocusChangeListener(this);
 
         TypedValue out = new TypedValue();
-        res.getValue(R.raw.unselected_scale, out, true);
+        res.getValue(R.integer.unselected_scale, out, true);
         mUnselectedScale = out.getFloat();
         mSelectedScaleDelta = res.getFraction(R.fraction.lb_focus_zoom_factor_medium, 1, 1) -
                 mUnselectedScale;