summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-10-10 14:15:46 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-10 14:15:46 -0700
commita433be70632e02e32dfc2e26f03e7cabb7f0e208 (patch)
treea4806fca16d22780237a4c61b14638afdd508586
parent5b589a01cd291ae3599bc3824f6732c109df056a (diff)
parentb86d516bccffc56af9716a39f3d217e928d02d04 (diff)
downloadandroid_packages_apps_Trebuchet-a433be70632e02e32dfc2e26f03e7cabb7f0e208.tar.gz
android_packages_apps_Trebuchet-a433be70632e02e32dfc2e26f03e7cabb7f0e208.tar.bz2
android_packages_apps_Trebuchet-a433be70632e02e32dfc2e26f03e7cabb7f0e208.zip
Merge "Update custom cling params" into jb-mr1-dev
-rw-r--r--res/values/dimens.xml1
-rw-r--r--src/com/android/launcher2/Launcher.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 628884fc3..e82f618d5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -25,6 +25,7 @@
<!-- entries for custom clings, will be set in overlays -->
<add-resource type="dimen" name="custom_cling_margin_top" />
<add-resource type="dimen" name="custom_cling_margin_right" />
+ <add-resource type="dimen" name="custom_cling_margin_left" />
<!-- Workspace -->
<!-- qsb_bar_height_inset represents qsb_bar_height minus the padding
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 700f9211e..6fcda8a13 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -55,7 +55,6 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
-import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;