Remove android.support.v7.widget.Space.
android.support.v7.widget.Space has been deprecated since Feb 2015
and has a direct android.support.v4.widget.Space replacement.
Bug: 31068104
Change-Id: Ie714b73843bbbf8044a2dab3d07919b540bf51d6
diff --git a/api/current.txt b/api/current.txt
index 49d9306..06b648c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -10077,12 +10077,6 @@
method public boolean onFling(int, int);
}
- public final deprecated class Space extends android.support.v4.widget.Space {
- ctor public Space(android.content.Context);
- ctor public Space(android.content.Context, android.util.AttributeSet);
- ctor public Space(android.content.Context, android.util.AttributeSet, int);
- }
-
public class StaggeredGridLayoutManager extends android.support.v7.widget.RecyclerView.LayoutManager implements android.support.v7.widget.RecyclerView.SmoothScroller.ScrollVectorProvider {
ctor public StaggeredGridLayoutManager(android.content.Context, android.util.AttributeSet, int, int);
ctor public StaggeredGridLayoutManager(int, int);
diff --git a/v7/gridlayout/README.txt b/v7/gridlayout/README.txt
index a67bf2a..e754187 100644
--- a/v7/gridlayout/README.txt
+++ b/v7/gridlayout/README.txt
@@ -13,7 +13,7 @@
Make sure you use <android.support.v7.widget.GridLayout> in your
layouts instead of <GridLayout>.
-Same for <android.support.v7.widget.Space> instead of <Space>.
+Same for <android.support.v4.widget.Space> instead of <Space>.
Additionally, all of GridLayout's attributes should be put in the
namespace of the app, as those attributes have been redefined in
@@ -57,7 +57,7 @@
app:layout_row="3"
android:text="Button" />
- <android.support.v7.widget.Space <=== space widgets also need the full support package path
+ <android.support.v4.widget.Space <=== space widgets also need the full support package path
android:layout_width="21dp" <=== use the android namespace for width, height etc -- only use app: for the grid layout library's new resources
android:layout_height="1dp"
app:layout_column="0"
diff --git a/v7/gridlayout/src/android/support/v7/widget/GridLayout.java b/v7/gridlayout/src/android/support/v7/widget/GridLayout.java
index bcc66f4..b719892 100644
--- a/v7/gridlayout/src/android/support/v7/widget/GridLayout.java
+++ b/v7/gridlayout/src/android/support/v7/widget/GridLayout.java
@@ -83,7 +83,7 @@
* <h4>Space</h4>
*
* Space between children may be specified either by using instances of the
- * dedicated {@link android.support.v7.widget.Space} view or by setting the
+ * dedicated {@link android.support.v4.widget.Space} view or by setting the
*
* {@link ViewGroup.MarginLayoutParams#leftMargin leftMargin},
* {@link ViewGroup.MarginLayoutParams#topMargin topMargin},
@@ -635,7 +635,7 @@
/** @noinspection UnusedParameters*/
private int getDefaultMargin(View c, boolean horizontal, boolean leading) {
- if (c.getClass() == android.support.v7.widget.Space.class) {
+ if (c.getClass() == android.support.v4.widget.Space.class) {
return 0;
}
return mDefaultGap / 2;
diff --git a/v7/gridlayout/src/android/support/v7/widget/Space.java b/v7/gridlayout/src/android/support/v7/widget/Space.java
deleted file mode 100644
index e84bdfb..0000000
--- a/v7/gridlayout/src/android/support/v7/widget/Space.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.support.v7.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-/**
- * @deprecated Use {@link android.support.v4.widget.Space} instead.
- */
-@Deprecated
-public final class Space extends android.support.v4.widget.Space {
-
- public Space(Context context) {
- super(context);
- }
-
- public Space(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public Space(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
-}
