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

Commit 152f63e7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert Emergency call button on lock screen"

parents 1a36e651 2495404e
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -31,8 +31,9 @@
    <integer name="config_max_unlock_countdown_times">0</integer>

    <!-- True if we need to show on "Slide" lock screen -->
    <bool name="config_showEmergencyButton">true</bool>
    <bool name="config_showEmergencyButton">false</bool>

    <!-- True if Emergency call button to be displayed on lock screen -->
    <bool name="config_showEmergencyCallOnlyInLockScreen">false</bool>

    <!-- display airplane mode in lock sreen when phone is in APM mode -->
+8 −31
Original line number Diff line number Diff line
@@ -59,12 +59,6 @@
        android:scaleType="center"
        android:contentDescription="@string/accessibility_phone_button" />

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom|center_horizontal"
        android:orientation="vertical" >

    <com.android.systemui.statusbar.KeyguardAffordanceView
        android:id="@+id/lock_icon"
        android:layout_width="@dimen/keyguard_affordance_width"
@@ -75,21 +69,4 @@
        android:tint="#ffffffff"
        android:contentDescription="@string/accessibility_unlock_button" />

        <com.android.keyguard.EmergencyButton
            android:id="@+id/emergency_call_button"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_gravity="top|center_horizontal"
            android:layout_weight="1"
            android:layout_marginTop="@dimen/eca_overlap"
            android:drawableBottom="@drawable/lockscreen_emergency_button"
            android:text="@string/kg_emergency_call_label"
            style="?android:attr/buttonBarButtonStyle"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:textSize="@dimen/kg_status_line_font_size"
            android:textColor="?android:attr/textColorSecondary"
            android:drawablePadding="8dip"
            android:textAllCaps="@bool/kg_use_all_caps" />
       </LinearLayout>

</com.android.systemui.statusbar.phone.KeyguardBottomAreaView>