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

Commit ced46451 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am f4642bc8: am 0b728244: Update status area and emergency call logic to match new spec 

* commit 'f4642bc8':
  Update status area and emergency call logic to match new spec
parents b829b57f f4642bc8

core/res/res/layout-port/keyguard_host_view.xml

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
                android:paddingLeft="@dimen/keyguard_security_view_margin"

                android:paddingTop="@dimen/keyguard_security_view_margin"

                android:paddingRight="@dimen/keyguard_security_view_margin"

                android:paddingBottom="@dimen/keyguard_security_view_margin"

                android:gravity="center">

            </com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper>

        </com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer>

core/res/res/layout/keyguard_account_view.xml

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 
    android:layout_height="match_parent"

    android:orientation="vertical">



    <include layout="@layout/keyguard_sim_puk_pin_account_navigation"/>

    <include layout="@layout/keyguard_message_area"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />



    <RelativeLayout

        android:layout_width="match_parent"

core/res/res/layout/keyguard_emergency_carrier_area.xml

+33 −10
Original line number Diff line number Diff line
@@ -36,10 +36,20 @@ 
        android:textSize="@dimen/kg_status_line_font_size"

        android:textColor="?android:attr/textColorSecondary"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="-10dip"

        style="?android:attr/buttonBarStyle"

        android:orientation="horizontal"

        android:gravity="center"

        android:weightSum="2">



        <com.android.internal.policy.impl.keyguard.EmergencyButton

            android:id="@+id/emergency_call_button"

        android:layout_width="wrap_content"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:drawableLeft="@*android:drawable/lockscreen_emergency_button"

            android:text="@string/kg_emergency_call_label"

            style="?android:attr/buttonBarButtonStyle"
@@ -48,4 +58,17 @@ 
            android:textColor="?android:attr/textColorSecondary"

            android:drawablePadding="8dip" />



        <Button android:id="@+id/forgot_password_button"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:drawableLeft="@*android:drawable/lockscreen_forgot_password_button"

            style="?android:attr/buttonBarButtonStyle"

            android:textSize="@dimen/kg_status_line_font_size"

            android:textColor="?android:attr/textColorSecondary"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:drawablePadding="8dip"

            android:visibility="gone"/>

    </LinearLayout>



</LinearLayout>

core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml

deleted100644 → 0
+0 −73
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2012, 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.

*/

-->



<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens -->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:gravity="center"

    android:layout_gravity="center_horizontal"

    android:layout_alignParentBottom="true">



    <com.android.internal.policy.impl.keyguard.CarrierText

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textSize="@dimen/kg_status_line_font_size"

        android:textColor="?android:attr/textColorSecondary"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        style="?android:attr/buttonBarStyle"

        android:orientation="horizontal"

        android:gravity="center"

        android:weightSum="2">



        <com.android.internal.policy.impl.keyguard.EmergencyButton

            android:id="@+id/emergency_call_button"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:drawableLeft="@*android: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" />



        <Button android:id="@+id/forgot_password_button"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:drawableLeft="@*android:drawable/lockscreen_forgot_password_button"

            style="?android:attr/buttonBarButtonStyle"

            android:textSize="@dimen/kg_status_line_font_size"

            android:textColor="?android:attr/textColorSecondary"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:drawablePadding="8dip" 

            android:visibility="gone"/>

    </LinearLayout>



</LinearLayout>

core/res/res/layout/keyguard_face_unlock_view.xml

+4 −1
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <include layout="@layout/keyguard_navigation"/>

    <include layout="@layout/keyguard_message_area"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        />



    <RelativeLayout

        android:id="@+id/face_unlock_area_view"