Merge "Moves proactive hints and wellness toast into a linear layout." into ub-launcher3-qt-dev

This commit is contained in:
Zak Cohen
2019-05-15 23:03:42 +00:00
committed by Android (Google) Code Review
+37 -35
View File
@@ -35,40 +35,42 @@
android:focusable="false"
android:importantForAccessibility="no" />
<com.android.quickstep.views.DigitalWellBeingToast
android:id="@+id/digital_well_being_toast"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:importantForAccessibility="noHideDescendants"
android:background="@drawable/bg_wellbeing_toast"
android:layout_gravity="bottom"
android:gravity="center"
android:visibility="gone">
<ImageView
android:id="@+id/digital_well_being_hourglass"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_hourglass_top"
/>
<TextView
android:id="@+id/digital_well_being_remaining_time"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:fontFamily="sans-serif"
android:textSize="14sp"
android:textColor="@android:color/white"
android:gravity="center_vertical"
/>
</com.android.quickstep.views.DigitalWellBeingToast>
<FrameLayout
android:id="@+id/proactive_suggest_container"
android:layout_width="match_parent"
android:layout_height="36dp"
android:gravity="center"
android:layout_gravity="bottom|center"
android:translationY="20dp"
android:elevation="4dp"
/>
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="bottom|center_horizontal">
<FrameLayout
android:id="@+id/proactive_suggest_container"
android:layout_width="match_parent"
android:layout_height="36dp"
android:gravity="center"
android:visibility="gone"
/>
<com.android.quickstep.views.DigitalWellBeingToast
android:id="@+id/digital_well_being_toast"
android:layout_width="match_parent"
android:layout_height="48dp"
android:importantForAccessibility="noHideDescendants"
android:background="@drawable/bg_wellbeing_toast"
android:gravity="center"
android:visibility="gone">
<ImageView
android:id="@+id/digital_well_being_hourglass"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_hourglass_top"
/>
<TextView
android:id="@+id/digital_well_being_remaining_time"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:fontFamily="sans-serif"
android:textSize="14sp"
android:textColor="@android:color/white"
android:gravity="center_vertical"
/>
</com.android.quickstep.views.DigitalWellBeingToast>
</LinearLayout>
</com.android.quickstep.views.TaskView>