diff options
4 files changed, 4 insertions, 5 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 5e8c12310bb0..94d658a789fa 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 60a9fc233aa3..a51b9317db6a 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 45cdc07c65ae..1fcc9e4a9d7e 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 8028327efe2e..48a1904c03b1 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; |