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

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

Merge "Don't show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev

parents 6be441c5 9e0a2506

core/res/res/layout/keyguard_account_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
    </RelativeLayout>



    <!--  no room for ECA on this screen right now

    <include layout="@layout/keyguard_emergency_carrier_area"

    <include layout="@layout/keyguard_eca"

        android:id="@+id/keyguard_selector_fade_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

core/res/res/layout/keyguard_emergency_carrier_area_empty.xml

0 → 100644
+31 −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 is a blank layout to simplify implementation on landscape on phones

     it is referenced indirectly by keyguard_eca -->

<LinearLayout

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

    android:layout_width="0dip"

    android:layout_height="0dip"

    android:orientation="vertical"

    android:gravity="center"

    android:layout_gravity="center_horizontal"

    android:layout_alignParentBottom="true">



</LinearLayout>

core/res/res/layout/keyguard_face_unlock_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
       </com.android.internal.widget.FaceUnlockView>

    </FrameLayout>



    <include layout="@layout/keyguard_emergency_carrier_area"

    <include layout="@layout/keyguard_eca"

        android:id="@+id/keyguard_selector_fade_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

core/res/res/layout/keyguard_password_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
        android:layout_weight="1"

        />



    <include layout="@layout/keyguard_emergency_carrier_area"

    <include layout="@layout/keyguard_eca"

             android:id="@+id/keyguard_selector_fade_container"

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

core/res/res/layout/keyguard_pattern_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
                android:gravity="center"

                android:contentDescription="@string/keyguard_accessibility_pattern_area" />

          </FrameLayout>

          <include layout="@layout/keyguard_emergency_carrier_area"

          <include layout="@layout/keyguard_eca"

              android:id="@+id/keyguard_selector_fade_container"

              android:layout_width="match_parent"

              android:layout_height="wrap_content"