Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: e4735a9959

* commit 'e4735a99598bf29847a9f12dd7fae6d7df880bc4':
  Fix up some small resource issues
This commit is contained in:
Adam Lesinski
2016-02-16 18:44:19 +00:00
committed by android-build-merger
parent 5bfded9c4d e4735a9959
commit 54811ec9bc
4 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/values/strings.xml
View File

@@ -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>

2
packages/SystemUI/res/values/styles.xml
View File

@@ -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">

4
packages/SystemUI/res/values/values_tv.xml
View File

@@ -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>
<item format="float" type="integer" name="unselected_scale">1.0</item>
</resources>

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

@@ -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;