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

Commit 14bb25a3 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev

parents e6e81004 6f131416

core/res/res/layout/keyguard_account_view.xml

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

    android:orientation="vertical">



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

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



    <RelativeLayout

        android:layout_width="match_parent"
@@ -69,4 +69,12 @@ 


    </RelativeLayout>



    <include layout="@layout/keyguard_emergency_carrier_area"

        android:id="@+id/keyguard_selector_fade_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:layout_gravity="bottom|center_horizontal"

        android:gravity="center_horizontal" />



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

core/res/res/layout/keyguard_emergency_carrier_area_and_recovery.xml

0 → 100644
+65 −0
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="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal">



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

            android:id="@+id/emergency_call_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            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="wrap_content"

            android:layout_height="wrap_content"

            android:paddingLeft="20dp"

            android:paddingRight="20dp"

            android:textSize="@dimen/kg_status_line_font_size"

            android:visibility="gone"/>

    </LinearLayout>



</LinearLayout>

core/res/res/layout/keyguard_pattern_view.xml

+2 −16
Original line number Diff line number Diff line
@@ -38,22 +38,8 @@ 
            android:orientation="vertical"

            android:layout_gravity="center">



            <LinearLayout

                android:layout_height="wrap_content"

                android:layout_width="match_parent"

                android:orientation="vertical"

                android:gravity="center">



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



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

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:textSize="@dimen/kg_status_line_font_size"

                    android:visibility="gone"/>



            </LinearLayout>



            <!-- We need MATCH_PARENT here only to force the size of the parent to be passed to

            the pattern view for it to compute its size. This is an unusual case, caused by

            LockPatternView's requirement to maintain a square aspect ratio based on the width
@@ -69,7 +55,7 @@ 
                android:layout_gravity="center_horizontal"

                android:gravity="center" />



            <include layout="@layout/keyguard_emergency_carrier_area"

            <include layout="@layout/keyguard_emergency_carrier_area_and_recovery"

                android:id="@+id/keyguard_selector_fade_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

core/res/res/layout/keyguard_sim_pin_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
                android:layout_height="wrap_content"

                android:src="@drawable/ic_lockscreen_sim"/>



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

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

         </LinearLayout>



        <!-- Password entry field -->