Merge "Add error log for adding parented complications." into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
786c9acaa6
@@ -21,6 +21,7 @@ import static com.android.systemui.dreams.complication.dagger.ComplicationModule
|
|||||||
|
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import android.graphics.Region;
|
import android.graphics.Region;
|
||||||
|
import android.util.Log;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||||
@@ -42,6 +43,8 @@ import javax.inject.Named;
|
|||||||
* a {@link ComplicationLayoutEngine}.
|
* a {@link ComplicationLayoutEngine}.
|
||||||
*/
|
*/
|
||||||
public class ComplicationHostViewController extends ViewController<ConstraintLayout> {
|
public class ComplicationHostViewController extends ViewController<ConstraintLayout> {
|
||||||
|
public static final String TAG = "ComplicationHostViewController";
|
||||||
|
|
||||||
private final ComplicationLayoutEngine mLayoutEngine;
|
private final ComplicationLayoutEngine mLayoutEngine;
|
||||||
private final LifecycleOwner mLifecycleOwner;
|
private final LifecycleOwner mLifecycleOwner;
|
||||||
private final ComplicationCollectionViewModel mComplicationCollectionViewModel;
|
private final ComplicationCollectionViewModel mComplicationCollectionViewModel;
|
||||||
@@ -113,6 +116,12 @@ public class ComplicationHostViewController extends ViewController<ConstraintLay
|
|||||||
final Complication.ViewHolder viewHolder = complication.getComplication()
|
final Complication.ViewHolder viewHolder = complication.getComplication()
|
||||||
.createView(complication);
|
.createView(complication);
|
||||||
mComplications.put(id, viewHolder);
|
mComplications.put(id, viewHolder);
|
||||||
|
if (viewHolder.getView().getParent() != null) {
|
||||||
|
Log.e(TAG, "View for complication "
|
||||||
|
+ complication.getComplication().getClass()
|
||||||
|
+ " already has a parent. Make sure not to reuse complication "
|
||||||
|
+ "views!");
|
||||||
|
}
|
||||||
mLayoutEngine.addComplication(id, viewHolder.getView(),
|
mLayoutEngine.addComplication(id, viewHolder.getView(),
|
||||||
viewHolder.getLayoutParams(), viewHolder.getCategory());
|
viewHolder.getLayoutParams(), viewHolder.getCategory());
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user