Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4735a99 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Fix up some small resource issues" into nyc-dev

parents f9b78bb6 4c44359d

packages/SystemUI/res/values/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -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">

packages/SystemUI/res/values/values_tv.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

    <item format="float" type="integer" name="unselected_scale">1.0</item>

</resources>

packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java

+1 −1
Original line number Diff line number Diff line
@@ -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;