Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94a6d15e authored by Siva Velusamy's avatar Siva Velusamy
Browse files

Use new hierarchy viewer protocol in all View subclasses 

A previous CL introduced a new way of encoding view properties for
use by heirarchy viewer. This CL updates all views using the old
@ExportedProperty annotation to use this new method. The older
mechanism will be removed in a subsequent CL.

Change-Id: I6cc23b90cd9da1c6ce89b4caffe54874db203452
parent 0d857b90

core/java/android/app/ActionBar.java

+9 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.view.KeyEvent; 
import android.view.View;

import android.view.ViewDebug;

import android.view.ViewGroup;

import android.view.ViewHierarchyEncoder;

import android.view.Window;

import android.widget.SpinnerAdapter;

import java.lang.annotation.Retention;
@@ -1373,5 +1374,13 @@ public abstract class ActionBar { 
         * version of the SDK an app can end up statically linking to the new MarginLayoutParams

         * overload, causing a crash when running on older platform versions with no other changes.

         */



        /** @hide */

        @Override

        protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) {

            super.encodeProperties(encoder);



            encoder.addProperty("gravity", gravity);

        }

    }

}

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -22355,7 +22355,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
    }















    /** {@hide} */













    void encode(@NonNull ViewHierarchyEncoder stream) {













    public void encode(@NonNull ViewHierarchyEncoder stream) {















        stream.beginObject(this);















        encodeProperties(stream);















        stream.endObject();

























core/java/android/webkit/WebView.java



+16
−0




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.webkit;





























import android.annotation.NonNull;















import android.annotation.SystemApi;















import android.annotation.Widget;















import android.content.Context;










@@ -43,6 +44,7 @@ import android.view.View;













import android.view.ViewAssistStructure;















import android.view.ViewDebug;















import android.view.ViewGroup;













import android.view.ViewHierarchyEncoder;















import android.view.ViewTreeObserver;















import android.view.accessibility.AccessibilityEvent;















import android.view.accessibility.AccessibilityNodeInfo;










@@ -2576,4 +2578,18 @@ public class WebView extends AbsoluteLayout













        super.onFinishTemporaryDetach();















        mProvider.getViewDelegate().onFinishTemporaryDetach();















    }



























    /** @hide */













    @Override













    protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) {













        super.encodeProperties(encoder);



























        checkThread();













        encoder.addProperty("webview:contentHeight", mProvider.getContentHeight());













        encoder.addProperty("webview:contentWidth", mProvider.getContentWidth());













        encoder.addProperty("webview:scale", mProvider.getScale());













        encoder.addProperty("webview:title", mProvider.getTitle());













        encoder.addProperty("webview:url", mProvider.getUrl());













        encoder.addProperty("webview:originalUrl", mProvider.getOriginalUrl());













    }















}
























core/java/android/widget/AbsListView.java



+31
−0




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.widget;





























import android.annotation.ColorInt;















import android.annotation.DrawableRes;













import android.annotation.NonNull;















import android.content.Context;















import android.content.Intent;















import android.content.res.TypedArray;










@@ -56,6 +57,7 @@ import android.view.View;













import android.view.ViewConfiguration;















import android.view.ViewDebug;















import android.view.ViewGroup;













import android.view.ViewHierarchyEncoder;















import android.view.ViewParent;















import android.view.ViewTreeObserver;















import android.view.accessibility.AccessibilityEvent;










@@ -6330,6 +6332,16 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te













        public LayoutParams(ViewGroup.LayoutParams source) {















            super(source);















        }



























        /** @hide */













        @Override













        protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) {













            super.encodeProperties(encoder);



























            encoder.addProperty("list:viewType", viewType);













            encoder.addProperty("list:recycledHeaderFooter", recycledHeaderFooter);













            encoder.addProperty("list:forceAdd", forceAdd);













        }















    }































    /**










@@ -6912,6 +6924,25 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te













        }















    }





























    /** @hide */













    @Override













    protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) {













        super.encodeProperties(encoder);



























        encoder.addProperty("drawing:cacheColorHint", getCacheColorHint());













        encoder.addProperty("list:fastScrollEnabled", isFastScrollEnabled());













        encoder.addProperty("list:scrollingCacheEnabled", isScrollingCacheEnabled());













        encoder.addProperty("list:smoothScrollbarEnabled", isSmoothScrollbarEnabled());













        encoder.addProperty("list:stackFromBottom", isStackFromBottom());













        encoder.addProperty("list:textFilterEnabled", isTextFilterEnabled());



























        View selectedView = getSelectedView();













        if (selectedView != null) {













            encoder.addPropertyKey("selectedView");













            selectedView.encode(encoder);













        }













    }





























    /**















     * Abstract positon scroller used to handle smooth scrolling.















     */

































core/java/android/widget/ActionMenuView.java



+14
−0




























Original line number
Diff line number
Diff line








@@ -15,6 +15,7 @@













 */















package android.widget;





























import android.annotation.NonNull;















import android.annotation.StyleRes;















import android.content.Context;















import android.content.res.ColorStateList;









@@ -28,6 +29,7 @@ import android.view.MenuItem;













import android.view.View;















import android.view.ViewDebug;















import android.view.ViewGroup;













import android.view.ViewHierarchyEncoder;















import android.view.accessibility.AccessibilityEvent;















import com.android.internal.view.menu.ActionMenuItemView;















import com.android.internal.view.menu.MenuBuilder;










@@ -835,5 +837,17 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo













            super(width, height);















            this.isOverflowButton = isOverflowButton;















        }



























        /** @hide */













        @Override













        protected void encodeProperties(@NonNull ViewHierarchyEncoder encoder) {













            super.encodeProperties(encoder);



























            encoder.addProperty("layout:overFlowButton", isOverflowButton);













            encoder.addProperty("layout:cellsUsed", cellsUsed);













            encoder.addProperty("layout:extraPixels", extraPixels);













            encoder.addProperty("layout:expandable", expandable);













            encoder.addProperty("layout:preventEdgeOffset", preventEdgeOffset);













        }















    }















}