From 9f8a7db5f9edb4975cce9a0c2ffe18828f76e421 Mon Sep 17 00:00:00 2001
From: Stevie Kideckel <kideckel@google.com>
Date: Tue, 20 Apr 2021 16:08:07 +0000
Subject: [PATCH] Expose GridView/Layout APIs via @RemotableViewMethod

Bug: 185972660
Test: Built and ran locally, annotation change only

Change-Id: I85fc00ae62b124653e20fd53f9179493463933e0
---
 core/java/android/widget/GridLayout.java | 4 ++++
 core/java/android/widget/GridView.java   | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java
index 50773b1c43b9c..5ca9d13b11800 100644
--- a/core/java/android/widget/GridLayout.java
+++ b/core/java/android/widget/GridLayout.java
@@ -46,6 +46,7 @@ import android.util.LogPrinter;
 import android.util.Pair;
 import android.util.Printer;
 import android.view.Gravity;
+import android.view.RemotableViewMethod;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inspector.InspectableProperty;
@@ -412,6 +413,7 @@ public class GridLayout extends ViewGroup {
      *
      * @attr ref android.R.styleable#GridLayout_rowCount
      */
+    @RemotableViewMethod
     public void setRowCount(int rowCount) {
         mVerticalAxis.setCount(rowCount);
         invalidateStructure();
@@ -446,6 +448,7 @@ public class GridLayout extends ViewGroup {
      *
      * @attr ref android.R.styleable#GridLayout_columnCount
      */
+    @RemotableViewMethod
     public void setColumnCount(int columnCount) {
         mHorizontalAxis.setCount(columnCount);
         invalidateStructure();
@@ -534,6 +537,7 @@ public class GridLayout extends ViewGroup {
      *
      * @attr ref android.R.styleable#GridLayout_alignmentMode
      */
+    @RemotableViewMethod
     public void setAlignmentMode(@AlignmentMode int alignmentMode) {
         this.mAlignmentMode = alignmentMode;
         requestLayout();
diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java
index 196d68bcd08a6..647f69d9edc59 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;