Merge "Merge Android 12"

1 files changed, 7 insertions, 0 deletions

diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index 196d68bcd08a..647f69d9edc5 100644
--- a/core/java/android/widget/GridView.java
+++ b/core/java/android/widget/GridView.java
@@ -30,6 +30,7 @@ import android.util.AttributeSet;
 import android.util.MathUtils;
 import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.RemotableViewMethod;
 import android.view.SoundEffectConstants;
 import android.view.View;
 import android.view.ViewDebug;
@@ -2050,6 +2051,7 @@ public class GridView extends AbsListView {
      *
      * @attr ref android.R.styleable#GridView_gravity
      */
+    @RemotableViewMethod
     public void setGravity(int gravity) {
         if (mGravity != gravity) {
             mGravity = gravity;
@@ -2078,6 +2080,7 @@ public class GridView extends AbsListView {
      *
      * @attr ref android.R.styleable#GridView_horizontalSpacing
      */
+    @RemotableViewMethod
     public void setHorizontalSpacing(int horizontalSpacing) {
         if (horizontalSpacing != mRequestedHorizontalSpacing) {
             mRequestedHorizontalSpacing = horizontalSpacing;
@@ -2136,6 +2139,7 @@ public class GridView extends AbsListView {
      *
      * @attr ref android.R.styleable#GridView_verticalSpacing
      */
+    @RemotableViewMethod
     public void setVerticalSpacing(int verticalSpacing) {
         if (verticalSpacing != mVerticalSpacing) {
             mVerticalSpacing = verticalSpacing;
@@ -2165,6 +2169,7 @@ public class GridView extends AbsListView {
      *
      * @attr ref android.R.styleable#GridView_stretchMode
      */
+    @RemotableViewMethod
     public void setStretchMode(@StretchMode int stretchMode) {
         if (stretchMode != mStretchMode) {
             mStretchMode = stretchMode;
@@ -2191,6 +2196,7 @@ public class GridView extends AbsListView {
      *
      * @attr ref android.R.styleable#GridView_columnWidth
      */
+    @RemotableViewMethod
     public void setColumnWidth(int columnWidth) {
         if (columnWidth != mRequestedColumnWidth) {
             mRequestedColumnWidth = columnWidth;
@@ -2239,6 +2245,7 @@ public class GridView extends AbsListView {
      *
      * @attr ref android.R.styleable#GridView_numColumns
      */
+    @RemotableViewMethod
     public void setNumColumns(int numColumns) {
         if (numColumns != mRequestedNumColumns) {
             mRequestedNumColumns = numColumns;