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

…creen-dev

core/res/res/layout/keyguard_account_view.xml

@@ -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,0 +1,31 @@
+<?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

@@ -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

@@ -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

@@ -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"

core/res/res/layout/keyguard_pin_view.xml

@@ -212,7 +212,7 @@
                />
        </LinearLayout>
     </LinearLayout>
-    <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_selector_view.xml

@@ -53,7 +53,7 @@
 
         <include layout="@layout/keyguard_glow_pad_container" />
 
-        <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="48dp"

core/res/res/layout/keyguard_sim_pin_view.xml

@@ -218,7 +218,7 @@
        </LinearLayout>
     </LinearLayout>
 
-    <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_sim_puk_view.xml

@@ -219,7 +219,7 @@
        </LinearLayout>
     </LinearLayout>
 
-    <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/values-land/alias.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** 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.
+*/
+-->
+<resources>
+    <!-- Alias used to reference one of two possible layouts in keyguard.  -->
+    <item type="layout" name="keyguard_eca">@android:layout/keyguard_emergency_carrier_area_empty</item>
+</resources>

core/res/res/values-port/alias.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** 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.
+*/
+-->
+<resources>
+    <!-- Alias used to reference one of two possible layouts in keyguard.  -->
+    <item type="layout" name="keyguard_eca">@android:layout/keyguard_emergency_carrier_area</item>
+</resources>

core/res/res/values-sw600dp/alias.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/colors.xml
+**
+** 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.
+*/
+-->
+<resources>
+    <!-- Alias used to reference one of two possible layouts in keyguard.  -->
+    <item type="layout" name="keyguard_eca">@android:layout/keyguard_emergency_carrier_area</item>
+</resources>