diff --git a/ApiDemos/project/ON_CLICKS.md b/ApiDemos/project/ON_CLICKS.md
index 57f01e24..5f66288d 100644
--- a/ApiDemos/project/ON_CLICKS.md
+++ b/ApiDemos/project/ON_CLICKS.md
@@ -2,275 +2,52 @@
 
 This file tracks the progress of refactoring `android:onClick` attributes to use View Binding and programmatic click listeners.
 
-- [x] `setNoPadding`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `setMorePadding`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `moveToOperaHouse`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `moveToSFO`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `moveToAUS`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onScreenshot`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onClearScreenshot`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onRequestPosition`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onMovePosition`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onPanLeft`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onPanUp`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onPanDown`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onPanRight`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onZoomIn`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onZoomOut`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onGoToSydney`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onGoToSanFran`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onGoToSantorini`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onGoToInvalid`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `toggleClickability`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [ ] `onClearMap`
-  - [ ] Replaced in `java-app`
-  - [ ] Replaced in `kotlin-app`
-  - [ ] Removed from XML
-- [ ] `onResetMap`
-  - [ ] Replaced in `java-app`
-  - [ ] Replaced in `kotlin-app`
-  - [ ] Removed from XML
-- [ ] `onToggleFlat`
-  - [ ] Replaced in `java-app`
-  - [ ] Replaced in `kotlin-app`
-  - [ ] Removed from XML
-- [x] `onFocusedBuildingInfo`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onToggleLevelPicker`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onVisibleLevelInfo`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onHigherLevel`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onTrafficToggled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onMyLocationToggled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onBuildingsToggled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onIndoorToggled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onStopAnimation`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onToggleAnimate`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onScrollLeft`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onScrollUp`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onScrollDown`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onScrollRight`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onTiltMore`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onTiltLess`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onToggleCustomDuration`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onGoToBondi`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `setZoomButtonsEnabled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `setCompassEnabled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `setMyLocationButtonEnabled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `setMyLocationLayerEnabled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `setScrollGesturesEnabled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `setZoomGesturesEnabled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `setTiltGesturesEnabled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `setRotateGesturesEnabled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `setFadeIn`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `switchImage`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `showDarwin`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `showAdelaide`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `showAustralia`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onStreetNamesToggled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onNavigationToggled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onZoomToggled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onPanningToggled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onOutdoorToggled`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
+## `common-ui/src/main/res/layout/camera_clamping_demo.xml`
+
 - [x] `onSetMinZoomClamp`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
 - [x] `onSetMaxZoomClamp`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
 - [x] `onMinMaxZoomClampReset`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onClampToAdelaide`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
 - [x] `onClampToPacific`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
 - [x] `onLatLngClampReset`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [ ] `onClick`
-  - [ ] Replaced in `java-app`
-  - [ ] Replaced in `kotlin-app`
-  - [ ] Removed from XML
-- [x] `onButtonClicked`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
-- [x] `onGoToLocation`
-  - [x] Replaced in `java-app`
-  - [x] Replaced in `kotlin-app`
-  - [x] Removed from XML
\ No newline at end of file
+
+## `common-ui/src/main/res/layout/ground_overlay_demo.xml`
+
+- [ ] `toggleClickability`
+
+## `common-ui/src/main/res/layout/indoor_demo.xml`
+
+- [ ] `onToggleLevelPicker`
+- [ ] `onVisibleLevelInfo`
+- [ ] `onHigherLevel`
+
+## `common-ui/src/main/res/layout/layers_demo.xml`
+
+- [ ] `onMyLocationToggled`
+- [ ] `onBuildingsToggled`
+- [ ] `onIndoorToggled`
+
+## `common-ui/src/main/res/layout/marker_demo.xml`
+
+- [ ] `onToggleFlat`
+
+## `common-ui/src/main/res/layout/polygon_demo.xml`
+
+- [ ] `toggleClickability`
+
+## `common-ui/src/main/res/layout/polyline_demo.xml`
+
+- [ ] `toggleClickability`
+
+## `common-ui/src/main/res/layout/street_view_panorama_navigation_demo.xml`
+
+- [ ] `onPanUp`
+- [ ] `onPanDown`
+- [ ] `onPanRight`
+- [ ] `onZoomIn`
+- [ ] `onZoomOut`
+
+## `common-ui/src/main/res/layout/street_view_panorama_options_demo.xml`
+
+- [ ] `onNavigationToggled`
+- [ ] `onZoomToggled`
+- [ ] `onPanningToggled`
diff --git a/ApiDemos/project/common-ui/src/main/res/layout/camera_clamping_demo.xml b/ApiDemos/project/common-ui/src/main/res/layout/camera_clamping_demo.xml
index b995c3cb..b921ff75 100644
--- a/ApiDemos/project/common-ui/src/main/res/layout/camera_clamping_demo.xml
+++ b/ApiDemos/project/common-ui/src/main/res/layout/camera_clamping_demo.xml
@@ -68,7 +68,7 @@
                 android:id="@+id/clamp_min_zoom"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:onClick="onSetMinZoomClamp"
+
                 android:text="@string/clamp_min_zoom" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/ApiDemos/project/common-ui/src/main/res/layout/marker_demo.xml b/ApiDemos/project/common-ui/src/main/res/layout/marker_demo.xml
index 2576159a..30f3bdf7 100644
--- a/ApiDemos/project/common-ui/src/main/res/layout/marker_demo.xml
+++ b/ApiDemos/project/common-ui/src/main/res/layout/marker_demo.xml
@@ -111,13 +111,11 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <CheckBox
-                android:id="@+id/flat"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:onClick="onToggleFlat"
-                android:text="@string/flat"
-                android:textSize="14sp" />
+        <CheckBox
+            android:id="@+id/flat"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/flat" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/ApiDemos/project/common-ui/src/main/res/layout/street_view_panorama_navigation_demo.xml b/ApiDemos/project/common-ui/src/main/res/layout/street_view_panorama_navigation_demo.xml
index f7ac19aa..07fb8357 100755
--- a/ApiDemos/project/common-ui/src/main/res/layout/street_view_panorama_navigation_demo.xml
+++ b/ApiDemos/project/common-ui/src/main/res/layout/street_view_panorama_navigation_demo.xml
@@ -74,7 +74,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:minWidth="48dp"
-                android:onClick="onPanLeft"
+
                 android:text="@string/left_arrow" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/ApiDemos/project/java-app/src/main/java/com/example/mapdemo/VisibleRegionDemoActivity.java b/ApiDemos/project/java-app/src/main/java/com/example/mapdemo/VisibleRegionDemoActivity.java
index 5aa21888..6729049e 100755
--- a/ApiDemos/project/java-app/src/main/java/com/example/mapdemo/VisibleRegionDemoActivity.java
+++ b/ApiDemos/project/java-app/src/main/java/com/example/mapdemo/VisibleRegionDemoActivity.java
@@ -20,14 +20,11 @@ import android.os.SystemClock;
 import android.view.View;
 import android.view.animation.Interpolator;
 import android.view.animation.OvershootInterpolator;
-import android.widget.TextView;
 import android.widget.Toast;
-import androidx.appcompat.app.AppCompatActivity;
+
 import com.example.common_ui.databinding.VisibleRegionDemoBinding;
-import com.example.mapdemo.R;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.GoogleMap.OnCameraIdleListener;
 import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
diff --git a/ApiDemos/project/java-app/src/v3/java/com/example/mapdemo/CameraClampingDemoActivity.java b/ApiDemos/project/java-app/src/v3/java/com/example/mapdemo/CameraClampingDemoActivity.java
index c4f99b1f..6a8be2bd 100644
--- a/ApiDemos/project/java-app/src/v3/java/com/example/mapdemo/CameraClampingDemoActivity.java
+++ b/ApiDemos/project/java-app/src/v3/java/com/example/mapdemo/CameraClampingDemoActivity.java
@@ -65,6 +65,7 @@ public class CameraClampingDemoActivity extends AppCompatActivity
 
     private TextView mCameraTextView;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/ApiDemos/project/settings.gradle.kts b/ApiDemos/project/settings.gradle.kts
index adf9fcb2..4ee48d8f 100644
--- a/ApiDemos/project/settings.gradle.kts
+++ b/ApiDemos/project/settings.gradle.kts
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
+include(":common-ui")
 include(":java-app")
 include(":kotlin-app")
-include(":common-ui")