commit 17aec2159a5b5f9729c501e257936a55544b0665
author Cole Faust <colefaust@google.com> Mon Jul 13 17:40:30 2020 -0700
committer Cole Faust <colefaust@google.com> Mon Jul 13 17:42:31 2020 -0700
tree 61e85f8cdad9ca920d1b77df108ab74bf3c5644a
parent 97e3813ad8501f927a617c07f89a948d2bb2af8e

Remove subclass of InsetsUpdater

InsetsUpdater had a bug fix (see other cl in the topic),
and as part of the bug fix it is no longer necessary
to subclass it and provide a different content view.

Bug: 12144122
Test: Manually
Change-Id: I6adfdbd1cc6ab46cee787cfe28f1b0c9f77d8452

src/com/android/car/media/GuidelinesUpdater.java

diff --git a/src/com/android/car/media/GuidelinesUpdater.java b/src/com/android/car/media/GuidelinesUpdater.java
index 5e5f919..4d92a88 100644
--- a/src/com/android/car/media/GuidelinesUpdater.java
+++ b/src/com/android/car/media/GuidelinesUpdater.java
@@ -25,7 +25,6 @@
 import com.android.car.ui.baselayout.Insets;
 import com.android.car.ui.baselayout.InsetsChangedListener;
 import com.android.car.ui.core.BaseLayoutController;
-import com.android.car.ui.utils.CarUiUtils;
 
 /**
  * Applies the insets computed by the car-ui-lib to the spacer views in ui_guides.xml. This allows
@@ -38,9 +37,10 @@
     public GuidelinesUpdater(Activity activity, View guidedView) {
         mGuidedView = guidedView;
 
-        View content = CarUiUtils.requireViewByRefId(mGuidedView,
-                R.id.car_ui_base_layout_content_container);
-        InsetsUpdater insetsUpdater = new InsetsUpdater(activity, mGuidedView, content, this);
+        BaseLayoutController.InsetsUpdater insetsUpdater =
+                new BaseLayoutController.InsetsUpdater(activity, mGuidedView, mGuidedView);
+        insetsUpdater.replaceInsetsChangedListenerWith(this);
+        insetsUpdater.installListeners();
     }
 
     // Read the results of the base layout measurements and adjust the guidelines to match
@@ -67,25 +67,4 @@
         bottom.setMargins(0, 0, 0, insets.getBottom());
         bottomPad.setLayoutParams(bottom);
     }
-
-
-
-    private static class InsetsUpdater extends BaseLayoutController.InsetsUpdater {
-
-        private final View mContentView;
-
-        InsetsUpdater(Activity activity, View baseLayout, View contentView,
-                InsetsChangedListener listener) {
-            super(activity, baseLayout, contentView);
-            replaceInsetsChangedListenerWith(listener);
-            mContentView = contentView;
-
-            installListeners();
-        }
-
-        @Override
-        protected View getContentView() {
-            return mContentView;
-        }
-    }
 }