Merge "Remove different layout for landscape in Keyguard" into lmp-dev

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

<?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">@layout/keyguard_emergency_carrier_area_empty</item>

</resources>

<?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">@layout/keyguard_emergency_carrier_area</item>

</resources>

    <!-- Alias used to reference framework activity duration.  -->

    <item type="integer" name="config_activityDefaultDur">@*android:integer/config_activityDefaultDur</item>

    <!-- Alias used to reference one of two possible layouts in keyguard.  -->

    <item type="layout" name="keyguard_eca">@layout/keyguard_emergency_carrier_area</item>

</resources>