summaryrefslogtreecommitdiffstats
path: root/res/values/attrs.xml
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-23 18:59:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-23 18:59:12 +0000
commit6828cbb7515eeaccd96f481232e252b9bc47d512 (patch)
treea9a2f94609945c9f7751d32b363787fe6a34b871 /res/values/attrs.xml
parent9314b7c01d932093c730dd39b9b9842d1a56efdb (diff)
parentb28c4fcf351dc9f44f69253b227880758f6b460c (diff)
downloadandroid_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.tar.gz
android_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.tar.bz2
android_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.zip
Merge "Landscape grid changes for Workspace/All Apps." into ub-launcher3-dorval-polish
Diffstat (limited to 'res/values/attrs.xml')
-rw-r--r--res/values/attrs.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 05e66ad91..7929e65d1 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -116,9 +116,9 @@
<attr name="numHotseatIcons" format="integer" />
<attr name="iconSize" format="float" />
+ <!-- landscapeIconSize defaults to iconSize, if not specified -->
+ <attr name="landscapeIconSize" format="float" />
<attr name="iconTextSize" format="float" />
- <!-- hotseatIconSize defaults to iconSize, if not specified -->
- <attr name="hotseatIconSize" format="float" />
<attr name="defaultLayoutId" format="reference" />
</declare-styleable>