commit fc38c5c04e0ed5bd24c894d1214de6d5e2d1c1ab
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 21 12:00:28 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 21 12:00:28 2019 +0000
tree 7246ead524946168ff8cc3875a93e63e53660ddf
parent c1d4c477111677a5379dd33dd0f7241a3173c05d
parent 1cdb780526a7b0490a6ec605e294f26a7373fc69

Merge "Revert layout transition from slice view"

res/layout/homepage_slice_tile.xml

diff --git a/res/layout/homepage_slice_tile.xml b/res/layout/homepage_slice_tile.xml
index b2badf5..ca8791f 100644
--- a/res/layout/homepage_slice_tile.xml
+++ b/res/layout/homepage_slice_tile.xml
@@ -31,7 +31,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:animateLayoutChanges="true"
             android:importantForAccessibility="no"
             style="@style/SliceViewStyle"/>
 

src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java

diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java b/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
index ee63536..ef0a67d 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceFullCardRendererHelper.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.homepage.contextualcards.slices;
 
-import android.animation.LayoutTransition;
 import android.content.Context;
 import android.view.View;
 
@@ -95,7 +94,6 @@
         public SliceViewHolder(View view) {
             super(view);
             sliceView = view.findViewById(R.id.slice_view);
-            sliceView.getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
         }
     }
 }