summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2016-11-02 16:56:52 -0700
committerJon Miranda <jonmiranda@google.com>2016-11-02 16:56:52 -0700
commitc3e4e228b153e037175e5a89bf75c1ea22b6a284 (patch)
treeaf3d974bb23e3725c0f8fd1c9b3b7410bbbe2131
parentdf3bc52ca9c4271398d35b17cf550ca9099b8249 (diff)
downloadandroid_packages_apps_Trebuchet-c3e4e228b153e037175e5a89bf75c1ea22b6a284.zip
android_packages_apps_Trebuchet-c3e4e228b153e037175e5a89bf75c1ea22b6a284.tar.gz
android_packages_apps_Trebuchet-c3e4e228b153e037175e5a89bf75c1ea22b6a284.tar.bz2
Remove unused code in DeviceProfile.
Change-Id: I463302e6711ad39241257b8dff058d9f3e99d883
-rw-r--r--res/values/dimens.xml2
-rw-r--r--src/com/android/launcher3/BaseContainerView.java2
-rw-r--r--src/com/android/launcher3/DeviceProfile.java12
3 files changed, 2 insertions, 14 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 316e748..b07a400 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -33,8 +33,6 @@
<dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen>
<!-- Minimum space between workspace and hotseat in spring loaded mode -->
<dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen>
- <dimen name="dynamic_grid_container_land_left_padding">118dp</dimen>
- <dimen name="dynamic_grid_container_land_right_padding">66dp</dimen>
<!-- Drop target bar -->
<dimen name="dynamic_grid_drop_target_size">48dp</dimen>
diff --git a/src/com/android/launcher3/BaseContainerView.java b/src/com/android/launcher3/BaseContainerView.java
index eb358ec..ac7cbaf 100644
--- a/src/com/android/launcher3/BaseContainerView.java
+++ b/src/com/android/launcher3/BaseContainerView.java
@@ -120,7 +120,7 @@ public abstract class BaseContainerView extends FrameLayout
int paddingBottom;
DeviceProfile grid = Launcher.getLauncher(context).getDeviceProfile();
- int[] padding = grid.getContainerPadding(context);
+ int[] padding = grid.getContainerPadding();
paddingLeft = padding[0] + grid.edgeMarginPx;
paddingRight = padding[1] + grid.edgeMarginPx;
if (!grid.isVerticalBarLayout()) {
diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 72004d6..51e174f 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -116,10 +116,6 @@ public class DeviceProfile {
public int allAppsIconDrawablePaddingPx;
public float allAppsIconTextSizePx;
- // Containers
- private final int containerLeftPaddingPx;
- private final int containerRightPaddingPx;
-
// Drop Target
public int dropTargetBarSizePx;
@@ -184,10 +180,6 @@ public class DeviceProfile {
hotseatBarTopPaddingPx =
res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_top_padding);
hotseatLandGutterPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_gutter_width);
- containerLeftPaddingPx =
- res.getDimensionPixelSize(R.dimen.dynamic_grid_container_land_left_padding);
- containerRightPaddingPx =
- res.getDimensionPixelSize(R.dimen.dynamic_grid_container_land_right_padding);
// Determine sizes.
widthPx = width;
@@ -588,9 +580,7 @@ public class DeviceProfile {
/**
* @return the left/right paddings for all containers.
*/
- public final int[] getContainerPadding(Context context) {
- Resources res = context.getResources();
-
+ public final int[] getContainerPadding() {
// No paddings for portrait phone
if (isPhone && !isVerticalBarLayout()) {
return new int[] {0, 0};