drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jim Miller
2012-11-08 01:00:12 -08:00
committed by Android (Google) Code Review
parent 6be441c532 9e0a250600
commit e1a473b0d4
12 changed files with 108 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/layout/keyguard_account_view.xml
View File

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

31
core/res/res/layout/keyguard_emergency_carrier_area_empty.xml Normal file
View File

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

2
core/res/res/layout/keyguard_face_unlock_view.xml
View File

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

2
core/res/res/layout/keyguard_password_view.xml
View File

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

2
core/res/res/layout/keyguard_pattern_view.xml
View File

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

2
core/res/res/layout/keyguard_pin_view.xml
View File

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

2
core/res/res/layout/keyguard_selector_view.xml
View File

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

2
core/res/res/layout/keyguard_sim_pin_view.xml
View File

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

2
core/res/res/layout/keyguard_sim_puk_view.xml
View File

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

23
core/res/res/values-land/alias.xml Normal file
View File

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

23
core/res/res/values-port/alias.xml Normal file
View File

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

23
core/res/res/values-sw600dp/alias.xml Normal file
View File

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