Merge "Get elevation in time-lapse View Hierarchy capture." into tm-qpr-dev
diff --git a/protos/view_capture.proto b/protos/view_capture.proto
index 98574dd..349ff36 100644
--- a/protos/view_capture.proto
+++ b/protos/view_capture.proto
@@ -51,4 +51,6 @@
optional int32 visibility = 16;
repeated ViewNode children = 17;
+
+ optional float elevation = 18;
}
diff --git a/src/com/android/launcher3/util/ViewCapture.java b/src/com/android/launcher3/util/ViewCapture.java
index cf4e84a..58c8269 100644
--- a/src/com/android/launcher3/util/ViewCapture.java
+++ b/src/com/android/launcher3/util/ViewCapture.java
@@ -240,6 +240,7 @@
public float translateX, translateY;
public float scaleX, scaleY;
public float alpha;
+ public float elevation;
public int visibility;
public boolean willNotDraw;
@@ -271,6 +272,7 @@
visibility = view.getVisibility();
willNotDraw = view.willNotDraw();
+ elevation = view.getElevation();
}
/**
@@ -303,6 +305,7 @@
.setAlpha(alpha)
.setVisibility(visibility)
.setWillNotDraw(willNotDraw)
+ .setElevation(elevation)
.setClipChildren(clipChildren);
ViewPropertyRef result = next;