Merge "Avoid hotseat edu button overlapping" into ub-launcher3-rvc-dev

This commit is contained in:
TreeHugger Robot
2020-06-18 21:06:44 +00:00
committed by Android (Google) Code Review

View File

@@ -72,33 +72,42 @@
android:layout_height="0dp"
launcher:containerType="hotseat" />
<FrameLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/bottom_sheet_edu_padding"
android:paddingTop="8dp"
android:paddingRight="@dimen/bottom_sheet_edu_padding">
<Button
android:id="@+id/turn_predictions_on"
android:layout_width="wrap_content"
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:background="?android:attr/selectableItemBackground"
android:text="@string/hotseat_edu_accept"
android:textAlignment="textEnd"
android:textColor="@android:color/white" />
<Button
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight=".4">
<Button
android:id="@+id/no_thanks"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:text="@string/hotseat_edu_dismiss"
android:textColor="@android:color/white"/>
</FrameLayout>
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:id="@+id/no_thanks"
android:text="@string/hotseat_edu_dismiss"
android:layout_gravity="start"
android:background="?android:attr/selectableItemBackground"
android:textColor="@android:color/white" />
android:layout_gravity="center_vertical"
android:layout_weight=".6">
<Button
android:id="@+id/turn_predictions_on"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:gravity="end"
android:text="@string/hotseat_edu_accept"
android:textColor="@android:color/white"/>
</FrameLayout>
</FrameLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>