Cherry pick PR #7924: Fix: Fix non-public, non-static field name in CaptionSettings.java

cobalt/android/apk/app/src/main/java/dev/cobalt/coat/CaptionSettings.java

@@ -20,6 +20,7 @@
 /** Captures the system Caption style in properties as needed by the Starboard implementation. */
 public class CaptionSettings {
 
+<<<<<<< HEAD
   @UsedByNative public final boolean isEnabled;
   @UsedByNative public final float fontScale;
   @UsedByNative public final int edgeType;
@@ -30,18 +31,83 @@ public class CaptionSettings {
   @UsedByNative public final boolean hasBackgroundColor;
   @UsedByNative public final int windowColor;
   @UsedByNative public final boolean hasWindowColor;
+=======
+  private final boolean mIsEnabled;
+  private final float mFontScale;
+  private final int mEdgeType;
+  private final boolean mHasEdgeType;
+  private final int mForegroundColor;
+  private final boolean mHasForegroundColor;
+  private final int mBackgroundColor;
+  private final boolean mHasBackgroundColor;
+  private final int mWindowColor;
+  private final boolean mHasWindowColor;
+>>>>>>> 59b92462d69 (Fix: Fix non-public, non-static field name in CaptionSettings.java (#7924))
 
   public CaptionSettings(CaptioningManager cm) {
     CaptioningManager.CaptionStyle style = cm.getUserStyle();
-    isEnabled = cm.isEnabled();
-    fontScale = cm.getFontScale();
-    edgeType = style.edgeType;
-    hasEdgeType = style.hasEdgeType();
-    foregroundColor = style.foregroundColor;
-    hasForegroundColor = style.hasForegroundColor();
-    backgroundColor = style.backgroundColor;
-    hasBackgroundColor = style.hasBackgroundColor();
-    windowColor = style.windowColor;
-    hasWindowColor = style.hasWindowColor();
+    mIsEnabled = cm.isEnabled();
+    mFontScale = cm.getFontScale();
+    mEdgeType = style.edgeType;
+    mHasEdgeType = style.hasEdgeType();
+    mForegroundColor = style.foregroundColor;
+    mHasForegroundColor = style.hasForegroundColor();
+    mBackgroundColor = style.backgroundColor;
+    mHasBackgroundColor = style.hasBackgroundColor();
+    mWindowColor = style.windowColor;
+    mHasWindowColor = style.hasWindowColor();
   }
+<<<<<<< HEAD
+=======
+
+  @CalledByNative
+  public boolean isEnabled() {
+    return mIsEnabled;
+  }
+
+  @CalledByNative
+  public float getFontScale() {
+    return mFontScale;
+  }
+
+  @CalledByNative
+  public int getEdgeType() {
+    return mEdgeType;
+  }
+
+  @CalledByNative
+  public boolean hasEdgeType() {
+    return mHasEdgeType;
+  }
+
+  @CalledByNative
+  public int getForegroundColor() {
+    return mForegroundColor;
+  }
+
+  @CalledByNative
+  public boolean hasForegroundColor() {
+    return mHasForegroundColor;
+  }
+
+  @CalledByNative
+  public int getBackgroundColor() {
+    return mBackgroundColor;
+  }
+
+  @CalledByNative
+  public boolean hasBackgroundColor() {
+    return mHasBackgroundColor;
+  }
+
+  @CalledByNative
+  public int getWindowColor() {
+    return mWindowColor;
+  }
+
+  @CalledByNative
+  public boolean hasWindowColor() {
+    return mHasWindowColor;
+  }
+>>>>>>> 59b92462d69 (Fix: Fix non-public, non-static field name in CaptionSettings.java (#7924))
 }