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
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user