summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/BaseContainerView.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-04-04 16:35:22 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-04-04 16:35:47 -0700
commit13178ac822c2f378fe93b09c1c192523b4df06c0 (patch)
tree2e8350ea2fda418833b22165f69ec081e0d45445 /src/com/android/launcher3/BaseContainerView.java
parent19c5c5765d38656b298465f33256fd5c5b0978b5 (diff)
downloadandroid_packages_apps_Trebuchet-13178ac822c2f378fe93b09c1c192523b4df06c0.tar.gz
android_packages_apps_Trebuchet-13178ac822c2f378fe93b09c1c192523b4df06c0.tar.bz2
android_packages_apps_Trebuchet-13178ac822c2f378fe93b09c1c192523b4df06c0.zip
Adding an upper bound to all-apps width on larger devices
Change-Id: I16a0d8fb7c5023045d0a6b9e8089e0ab6a476d6d
Diffstat (limited to 'src/com/android/launcher3/BaseContainerView.java')
-rw-r--r--src/com/android/launcher3/BaseContainerView.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/com/android/launcher3/BaseContainerView.java b/src/com/android/launcher3/BaseContainerView.java
index 51a97b91b..64d50b7d0 100644
--- a/src/com/android/launcher3/BaseContainerView.java
+++ b/src/com/android/launcher3/BaseContainerView.java
@@ -18,16 +18,12 @@ package com.android.launcher3;
import android.content.Context;
import android.content.res.TypedArray;
-import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.InsetDrawable;
import android.util.AttributeSet;
-import android.util.Log;
import android.view.View;
import android.widget.FrameLayout;
-import com.android.launcher3.config.ProviderConfig;
-
/**
* A base container view, which supports resizing.
*/
@@ -52,9 +48,7 @@ public abstract class BaseContainerView extends FrameLayout {
super(context, attrs, defStyleAttr);
int width = ((Launcher) context).getDeviceProfile().availableWidthPx;
- mHorizontalPadding = Math.max(
- getResources().getDimensionPixelSize(R.dimen.container_min_margin),
- (int) getResources().getFraction(R.fraction.container_margin, width, 1));
+ mHorizontalPadding = DeviceProfile.getMaxContainerWidth(context, width);
TypedArray a = context.obtainStyledAttributes(attrs,
R.styleable.BaseContainerView, defStyleAttr, 0);