@@ -524,83 +524,33 @@ private boolean customDrawOrderDisabled() {
524
524
return ViewUtil .getUIManagerType (getId ()) == UIManagerType .FABRIC ;
525
525
}
526
526
527
- private void handleAddView (View view ) {
527
+ @ Override
528
+ public void onViewAdded (View child ) {
528
529
UiThreadUtil .assertOnUiThread ();
529
530
530
531
if (!customDrawOrderDisabled ()) {
531
- getDrawingOrderHelper ().handleAddView (view );
532
+ getDrawingOrderHelper ().handleAddView (child );
532
533
setChildrenDrawingOrderEnabled (getDrawingOrderHelper ().shouldEnableCustomDrawingOrder ());
533
534
} else {
534
535
setChildrenDrawingOrderEnabled (false );
535
536
}
537
+ super .onViewAdded (child );
536
538
}
537
539
538
- private void handleRemoveView (@ Nullable View view ) {
540
+ @ Override
541
+ public void onViewRemoved (View child ) {
539
542
UiThreadUtil .assertOnUiThread ();
540
543
541
544
if (!customDrawOrderDisabled ()) {
542
- if (indexOfChild (view ) == -1 ) {
545
+ if (indexOfChild (child ) == -1 ) {
543
546
return ;
544
547
}
545
- getDrawingOrderHelper ().handleRemoveView (view );
548
+ getDrawingOrderHelper ().handleRemoveView (child );
546
549
setChildrenDrawingOrderEnabled (getDrawingOrderHelper ().shouldEnableCustomDrawingOrder ());
547
550
} else {
548
551
setChildrenDrawingOrderEnabled (false );
549
552
}
550
- }
551
-
552
- private void handleRemoveViews (int start , int count ) {
553
- int endIndex = start + count ;
554
- for (int index = start ; index < endIndex ; index ++) {
555
- if (index < getChildCount ()) {
556
- handleRemoveView (getChildAt (index ));
557
- }
558
- }
559
- }
560
-
561
- @ Override
562
- public void addView (View child , int index , @ Nullable ViewGroup .LayoutParams params ) {
563
- // This will get called for every overload of addView so there is not need to override every
564
- // method.
565
- handleAddView (child );
566
- super .addView (child , index , params );
567
- }
568
-
569
- @ Override
570
- protected boolean addViewInLayout (
571
- View child , int index , LayoutParams params , boolean preventRequestLayout ) {
572
- handleAddView (child );
573
- return super .addViewInLayout (child , index , params , preventRequestLayout );
574
- }
575
-
576
- @ Override
577
- public void removeView (@ Nullable View view ) {
578
- handleRemoveView (view );
579
- super .removeView (view );
580
- }
581
-
582
- @ Override
583
- public void removeViewAt (int index ) {
584
- handleRemoveView (getChildAt (index ));
585
- super .removeViewAt (index );
586
- }
587
-
588
- @ Override
589
- public void removeViewInLayout (View view ) {
590
- handleRemoveView (view );
591
- super .removeViewInLayout (view );
592
- }
593
-
594
- @ Override
595
- public void removeViewsInLayout (int start , int count ) {
596
- handleRemoveViews (start , count );
597
- super .removeViewsInLayout (start , count );
598
- }
599
-
600
- @ Override
601
- public void removeViews (int start , int count ) {
602
- handleRemoveViews (start , count );
603
- super .removeViews (start , count );
553
+ super .onViewRemoved (child );
604
554
}
605
555
606
556
@ Override
0 commit comments