Merge "Add emergency call buttons to the work challenge screens in the case of managed subscription for work telephony"

This commit is contained in:
Oli Thompson
2023-02-03 13:00:58 +00:00
committed by Android (Google) Code Review
10 changed files with 137 additions and 0 deletions

View File

@@ -91,5 +91,17 @@
android:layout_gravity="center_horizontal"
android:text="@string/cancel" />
<Button
android:id="@+id/emergencyCallButton"
style="@style/WorkChallengeEmergencyButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginBottom="12dp"
android:visibility="gone"
android:layout_gravity="center_horizontal"
android:text="@string/work_challenge_emergency_button_text"/>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -84,5 +84,17 @@
android:layout_gravity="center_horizontal"
android:text="@string/cancel" />
<Button
android:id="@+id/emergencyCallButton"
style="@style/WorkChallengeEmergencyButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginBottom="12dp"
android:visibility="gone"
android:layout_gravity="center_horizontal"
android:text="@string/work_challenge_emergency_button_text"/>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.google.android.setupdesign.GlifLayout>

View File

@@ -89,6 +89,19 @@
android:layout_marginTop="12dp"
android:gravity="center_vertical"/>
<Button
android:id="@+id/emergencyCallButton"
style="@style/WorkChallengeEmergencyButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginTop="60dp"
android:layout_marginBottom="14dp"
android:visibility="gone"
android:layout_gravity="center_horizontal"
android:text="@string/work_challenge_emergency_button_text"/>
</LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

View File

@@ -71,6 +71,18 @@
android:layout_marginBottom="80dp"
android:text="@string/cancel" />
<Button
android:id="@+id/emergencyCallButton"
style="@style/WorkChallengeEmergencyButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="?attr/sudMarginStart"
android:layout_marginEnd="?attr/sudMarginEnd"
android:layout_marginBottom="12dp"
android:visibility="gone"
android:layout_gravity="center_horizontal"
android:text="@string/work_challenge_emergency_button_text"/>
</LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>