Rename launcher:iconSize attribute to prevent overriding material (7a865471) · Commits · e / os / android_packages_apps_Trebuchet

go/res/xml/device_profiles.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@
	launcher:name="Go Device"		launcher:name="Go Device"
	launcher:minWidthDps="296"		launcher:minWidthDps="296"
	launcher:minHeightDps="491.33"		launcher:minHeightDps="491.33"
	launcher:iconSize="60"		launcher:iconImageSize="60"
	launcher:iconTextSize="14.0"		launcher:iconTextSize="14.0"
	launcher:canBeDefault="true" />		launcher:canBeDefault="true" />

res/values/attrs.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -123,7 +123,7 @@
	<attr name="minWidthDps" format="float" />		<attr name="minWidthDps" format="float" />
	<attr name="minHeightDps" format="float" />		<attr name="minHeightDps" format="float" />

	<attr name="iconSize" format="float" />		<attr name="iconImageSize" format="float" />
	<!-- landscapeIconSize defaults to iconSize, if not specified -->		<!-- landscapeIconSize defaults to iconSize, if not specified -->
	<attr name="landscapeIconSize" format="float" />		<attr name="landscapeIconSize" format="float" />
	<attr name="iconTextSize" format="float" />		<attr name="iconTextSize" format="float" />

res/xml/device_profiles.xml

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@
	launcher:name="Super Short Stubby"		launcher:name="Super Short Stubby"
	launcher:minWidthDps="255"		launcher:minWidthDps="255"
	launcher:minHeightDps="300"		launcher:minHeightDps="300"
	launcher:iconSize="48"		launcher:iconImageSize="48"
	launcher:iconTextSize="13.0"		launcher:iconTextSize="13.0"
	launcher:canBeDefault="true" />		launcher:canBeDefault="true" />

	@@ -38,7 +38,7 @@
	launcher:name="Shorter Stubby"		launcher:name="Shorter Stubby"
	launcher:minWidthDps="255"		launcher:minWidthDps="255"
	launcher:minHeightDps="400"		launcher:minHeightDps="400"
	launcher:iconSize="48"		launcher:iconImageSize="48"
	launcher:iconTextSize="13.0"		launcher:iconTextSize="13.0"
	launcher:canBeDefault="true" />		launcher:canBeDefault="true" />

	@@ -57,7 +57,7 @@
	launcher:name="Short Stubby"		launcher:name="Short Stubby"
	launcher:minWidthDps="275"		launcher:minWidthDps="275"
	launcher:minHeightDps="420"		launcher:minHeightDps="420"
	launcher:iconSize="48"		launcher:iconImageSize="48"
	launcher:iconTextSize="13.0"		launcher:iconTextSize="13.0"
	launcher:canBeDefault="true" />		launcher:canBeDefault="true" />

	@@ -65,7 +65,7 @@
	launcher:name="Stubby"		launcher:name="Stubby"
	launcher:minWidthDps="255"		launcher:minWidthDps="255"
	launcher:minHeightDps="450"		launcher:minHeightDps="450"
	launcher:iconSize="48"		launcher:iconImageSize="48"
	launcher:iconTextSize="13.0"		launcher:iconTextSize="13.0"
	launcher:canBeDefault="true" />		launcher:canBeDefault="true" />

	@@ -73,7 +73,7 @@
	launcher:name="Nexus S"		launcher:name="Nexus S"
	launcher:minWidthDps="296"		launcher:minWidthDps="296"
	launcher:minHeightDps="491.33"		launcher:minHeightDps="491.33"
	launcher:iconSize="48"		launcher:iconImageSize="48"
	launcher:iconTextSize="13.0"		launcher:iconTextSize="13.0"
	launcher:canBeDefault="true" />		launcher:canBeDefault="true" />

	@@ -81,7 +81,7 @@
	launcher:name="Nexus 4"		launcher:name="Nexus 4"
	launcher:minWidthDps="359"		launcher:minWidthDps="359"
	launcher:minHeightDps="567"		launcher:minHeightDps="567"
	launcher:iconSize="54"		launcher:iconImageSize="54"
	launcher:iconTextSize="13.0"		launcher:iconTextSize="13.0"
	launcher:canBeDefault="true" />		launcher:canBeDefault="true" />

	@@ -89,7 +89,7 @@
	launcher:name="Nexus 5"		launcher:name="Nexus 5"
	launcher:minWidthDps="335"		launcher:minWidthDps="335"
	launcher:minHeightDps="567"		launcher:minHeightDps="567"
	launcher:iconSize="54"		launcher:iconImageSize="54"
	launcher:iconTextSize="13.0"		launcher:iconTextSize="13.0"
	launcher:canBeDefault="true" />		launcher:canBeDefault="true" />

	@@ -108,7 +108,7 @@
	launcher:name="Large Phone"		launcher:name="Large Phone"
	launcher:minWidthDps="406"		launcher:minWidthDps="406"
	launcher:minHeightDps="694"		launcher:minHeightDps="694"
	launcher:iconSize="56"		launcher:iconImageSize="56"
	launcher:iconTextSize="14.4"		launcher:iconTextSize="14.4"
	launcher:canBeDefault="true" />		launcher:canBeDefault="true" />

	@@ -116,7 +116,7 @@
	launcher:name="Shorter Stubby"		launcher:name="Shorter Stubby"
	launcher:minWidthDps="255"		launcher:minWidthDps="255"
	launcher:minHeightDps="400"		launcher:minHeightDps="400"
	launcher:iconSize="48"		launcher:iconImageSize="48"
	launcher:iconTextSize="13.0"		launcher:iconTextSize="13.0"
	launcher:canBeDefault="true" />		launcher:canBeDefault="true" />

src/com/android/launcher3/InvariantDeviceProfile.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -543,7 +543,7 @@ public class InvariantDeviceProfile {
	canBeDefault = a.getBoolean(		canBeDefault = a.getBoolean(
	R.styleable.ProfileDisplayOption_canBeDefault, false);		R.styleable.ProfileDisplayOption_canBeDefault, false);

	iconSize = a.getFloat(R.styleable.ProfileDisplayOption_iconSize, 0);		iconSize = a.getFloat(R.styleable.ProfileDisplayOption_iconImageSize, 0);
	landscapeIconSize = a.getFloat(R.styleable.ProfileDisplayOption_landscapeIconSize,		landscapeIconSize = a.getFloat(R.styleable.ProfileDisplayOption_landscapeIconSize,
	iconSize);		iconSize);
	iconTextSize = a.getFloat(R.styleable.ProfileDisplayOption_iconTextSize, 0);		iconTextSize = a.getFloat(R.styleable.ProfileDisplayOption_iconTextSize, 0);