Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd3bbc61 authored by Oli Thompson's avatar Oli Thompson
Browse files

Add emergency call buttons to the work challenge screens in the case of

managed subscription for work telephony

Test: manually tested for now

Bug: b/258631630
Change-Id: I700d0408e3ffa86a595072b1a4aad62bac33b01d
parent 96e6398e
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  ~ Copyright (C) 2022 The Android Open Source Project
  ~
  ~ Licensed under the Apache License, Version 2.0 (the "License");
  ~ you may not use this file except in compliance with the License.
  ~ You may obtain a copy of the License at
  ~
  ~      http://www.apache.org/licenses/LICENSE-2.0
  ~
  ~ Unless required by applicable law or agreed to in writing, software
  ~ distributed under the License is distributed on an "AS IS" BASIS,
  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  -->
<inset xmlns:android="http://schemas.android.com/apk/res/android">
    <shape android:shape="rectangle">
        <corners android:radius="25dp"/>
        <solid android:color="@android:color/system_accent3_100" />
    </shape>
</inset>
 No newline at end of file
+13 −0
Original line number Diff line number Diff line
@@ -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>
+13 −0
Original line number Diff line number Diff line
@@ -70,6 +70,19 @@
                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_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>
+12 −0
Original line number Diff line number Diff line
@@ -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>
+12 −0
Original line number Diff line number Diff line
@@ -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>
Loading