diff options
| -rw-r--r-- | go/res/xml/device_profiles.xml | 2 | ||||
| -rw-r--r-- | res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | res/xml/device_profiles.xml | 18 | ||||
| -rw-r--r-- | src/com/android/launcher3/InvariantDeviceProfile.java | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/go/res/xml/device_profiles.xml b/go/res/xml/device_profiles.xml index 92a2b6a81..0fd0eebfb 100644 --- a/go/res/xml/device_profiles.xml +++ b/go/res/xml/device_profiles.xml @@ -30,7 +30,7 @@ launcher:name="Go Device" launcher:minWidthDps="296" launcher:minHeightDps="491.33" - launcher:iconSize="60" + launcher:iconImageSize="60" launcher:iconTextSize="14.0" launcher:canBeDefault="true" /> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 465504c25..43194d5cb 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -123,7 +123,7 @@ <attr name="minWidthDps" format="float" /> <attr name="minHeightDps" format="float" /> - <attr name="iconSize" format="float" /> + <attr name="iconImageSize" format="float" /> <!-- landscapeIconSize defaults to iconSize, if not specified --> <attr name="landscapeIconSize" format="float" /> <attr name="iconTextSize" format="float" /> diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml index 88b1bc95a..82547d521 100644 --- a/res/xml/device_profiles.xml +++ b/res/xml/device_profiles.xml @@ -30,7 +30,7 @@ launcher:name="Super Short Stubby" launcher:minWidthDps="255" launcher:minHeightDps="300" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -38,7 +38,7 @@ launcher:name="Shorter Stubby" launcher:minWidthDps="255" launcher:minHeightDps="400" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -57,7 +57,7 @@ launcher:name="Short Stubby" launcher:minWidthDps="275" launcher:minHeightDps="420" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -65,7 +65,7 @@ launcher:name="Stubby" launcher:minWidthDps="255" launcher:minHeightDps="450" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -73,7 +73,7 @@ launcher:name="Nexus S" launcher:minWidthDps="296" launcher:minHeightDps="491.33" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -81,7 +81,7 @@ launcher:name="Nexus 4" launcher:minWidthDps="359" launcher:minHeightDps="567" - launcher:iconSize="54" + launcher:iconImageSize="54" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -89,7 +89,7 @@ launcher:name="Nexus 5" launcher:minWidthDps="335" launcher:minHeightDps="567" - launcher:iconSize="54" + launcher:iconImageSize="54" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> @@ -108,7 +108,7 @@ launcher:name="Large Phone" launcher:minWidthDps="406" launcher:minHeightDps="694" - launcher:iconSize="56" + launcher:iconImageSize="56" launcher:iconTextSize="14.4" launcher:canBeDefault="true" /> @@ -116,7 +116,7 @@ launcher:name="Shorter Stubby" launcher:minWidthDps="255" launcher:minHeightDps="400" - launcher:iconSize="48" + launcher:iconImageSize="48" launcher:iconTextSize="13.0" launcher:canBeDefault="true" /> diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index 296afe750..3e7f67bc6 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -543,7 +543,7 @@ public class InvariantDeviceProfile { canBeDefault = a.getBoolean( 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, iconSize); iconTextSize = a.getFloat(R.styleable.ProfileDisplayOption_iconTextSize, 0); |