Merge changes I6e73bcf9,I257ba108

* changes:
  Add a timeout waiting for contextual card loader.
  Set setting back to default when turning off dev option
This commit is contained in:
Fan Zhang
2018-12-13 04:03:28 +00:00
committed by Android (Google) Code Review
11 changed files with 55 additions and 38 deletions

View File

@@ -25,6 +25,6 @@
android:id="@+id/card_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_animation_fall_down"/>
android:layoutAnimation="@anim/layout_animation_fade_in"/>
</LinearLayout>