From 482a7e00164a3874d55e94b3d42a61e0f367e0d2 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Sun, 9 Feb 2014 15:34:34 +0000
Subject: [PATCH] Use least specific LayoutParams classes for broadest
usefulness.
---
.../android/util/CommonLayoutParams.java | 15 ++++++++-------
.../android/util/FixedVerticalSpace.java | 2 +-
.../android/util/HorizontalBorder.java | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java b/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java
index 3434766868..23ac065d42 100644
--- a/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java
+++ b/briar-android/src/org/briarproject/android/util/CommonLayoutParams.java
@@ -2,23 +2,24 @@ package org.briarproject.android.util;
import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
public class CommonLayoutParams {
- public static final LinearLayout.LayoutParams MATCH_MATCH =
- new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
+ public static final ViewGroup.LayoutParams MATCH_MATCH =
+ new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT);
- public static final LinearLayout.LayoutParams MATCH_WRAP =
- new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+ public static final ViewGroup.LayoutParams MATCH_WRAP =
+ new ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+
+ public static final ViewGroup.LayoutParams WRAP_WRAP =
+ new ViewGroup.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
public static final LinearLayout.LayoutParams MATCH_WRAP_1 =
new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT, 1);
- public static final LinearLayout.LayoutParams WRAP_WRAP =
- new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
-
public static final LinearLayout.LayoutParams WRAP_WRAP_1 =
new LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1);
diff --git a/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java b/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java
index 7a3bb9ee7c..da923d84b8 100644
--- a/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java
+++ b/briar-android/src/org/briarproject/android/util/FixedVerticalSpace.java
@@ -3,7 +3,7 @@ package org.briarproject.android.util;
import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
import android.content.Context;
import android.view.View;
-import android.widget.LinearLayout.LayoutParams;
+import android.view.ViewGroup.LayoutParams;
public class FixedVerticalSpace extends View {
diff --git a/briar-android/src/org/briarproject/android/util/HorizontalBorder.java b/briar-android/src/org/briarproject/android/util/HorizontalBorder.java
index 6911e371e0..65be8b379f 100644
--- a/briar-android/src/org/briarproject/android/util/HorizontalBorder.java
+++ b/briar-android/src/org/briarproject/android/util/HorizontalBorder.java
@@ -6,7 +6,7 @@ import org.briarproject.R;
import android.content.Context;
import android.view.View;
-import android.widget.LinearLayout.LayoutParams;
+import android.view.ViewGroup.LayoutParams;
public class HorizontalBorder extends View {
--
GitLab