diff options
author | Jim Miller <jaggies@google.com> | 2012-11-08 01:00:12 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-08 01:00:12 -0800 |
commit | e1a473b0d4d56f4258fc4c6ab4c9d4d0fe3fd3cc (patch) | |
tree | d1e6382531461ed5f942fd65dde4b9877bf3615b | |
parent | 6be441c532688762b735ae2a1276195b40bf33b4 (diff) | |
parent | 9e0a2506006de1ca2fe5cf8144e34a9b89f73772 (diff) | |
download | base-e1a473b0d4d56f4258fc4c6ab4c9d4d0fe3fd3cc.tar.gz |
Merge "Don't show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev
-rw-r--r-- | core/res/res/layout/keyguard_account_view.xml | 2 | ||||
-rw-r--r-- | core/res/res/layout/keyguard_emergency_carrier_area_empty.xml | 31 | ||||
-rw-r--r-- | core/res/res/layout/keyguard_face_unlock_view.xml | 2 | ||||
-rw-r--r-- | core/res/res/layout/keyguard_password_view.xml | 2 | ||||
-rw-r--r-- | core/res/res/layout/keyguard_pattern_view.xml | 2 | ||||
-rw-r--r-- | core/res/res/layout/keyguard_pin_view.xml | 2 | ||||
-rw-r--r-- | core/res/res/layout/keyguard_selector_view.xml | 2 | ||||
-rw-r--r-- | core/res/res/layout/keyguard_sim_pin_view.xml | 2 | ||||
-rw-r--r-- | core/res/res/layout/keyguard_sim_puk_view.xml | 2 | ||||
-rw-r--r-- | core/res/res/values-land/alias.xml | 23 | ||||
-rw-r--r-- | core/res/res/values-port/alias.xml | 23 | ||||
-rw-r--r-- | core/res/res/values-sw600dp/alias.xml | 23 |
12 files changed, 108 insertions, 8 deletions
diff --git a/core/res/res/layout/keyguard_account_view.xml b/core/res/res/layout/keyguard_account_view.xml index 8bc1da297350..fa36371a44d8 100644 --- a/core/res/res/layout/keyguard_account_view.xml +++ b/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" diff --git a/core/res/res/layout/keyguard_emergency_carrier_area_empty.xml b/core/res/res/layout/keyguard_emergency_carrier_area_empty.xml new file mode 100644 index 000000000000..2f4adae00cf7 --- /dev/null +++ b/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> diff --git a/core/res/res/layout/keyguard_face_unlock_view.xml b/core/res/res/layout/keyguard_face_unlock_view.xml index 12b6052667a3..c9f11761c3e3 100644 --- a/core/res/res/layout/keyguard_face_unlock_view.xml +++ b/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" diff --git a/core/res/res/layout/keyguard_password_view.xml b/core/res/res/layout/keyguard_password_view.xml index b9a05536afc2..aab54c3f23cb 100644 --- a/core/res/res/layout/keyguard_password_view.xml +++ b/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" diff --git a/core/res/res/layout/keyguard_pattern_view.xml b/core/res/res/layout/keyguard_pattern_view.xml index 7eb7698aadea..8d0d3f9d6527 100644 --- a/core/res/res/layout/keyguard_pattern_view.xml +++ b/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" diff --git a/core/res/res/layout/keyguard_pin_view.xml b/core/res/res/layout/keyguard_pin_view.xml index 5c26a5321ba2..e494b6997d38 100644 --- a/core/res/res/layout/keyguard_pin_view.xml +++ b/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" diff --git a/core/res/res/layout/keyguard_selector_view.xml b/core/res/res/layout/keyguard_selector_view.xml index 124bfc929b93..dfacb6a15103 100644 --- a/core/res/res/layout/keyguard_selector_view.xml +++ b/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" diff --git a/core/res/res/layout/keyguard_sim_pin_view.xml b/core/res/res/layout/keyguard_sim_pin_view.xml index 1c9c81e5516e..026b025091cd 100644 --- a/core/res/res/layout/keyguard_sim_pin_view.xml +++ b/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" diff --git a/core/res/res/layout/keyguard_sim_puk_view.xml b/core/res/res/layout/keyguard_sim_puk_view.xml index 06bd0148c061..28a9f9a3594d 100644 --- a/core/res/res/layout/keyguard_sim_puk_view.xml +++ b/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" diff --git a/core/res/res/values-land/alias.xml b/core/res/res/values-land/alias.xml new file mode 100644 index 000000000000..eac5ece14521 --- /dev/null +++ b/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> diff --git a/core/res/res/values-port/alias.xml b/core/res/res/values-port/alias.xml new file mode 100644 index 000000000000..bf3eecb992ba --- /dev/null +++ b/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> diff --git a/core/res/res/values-sw600dp/alias.xml b/core/res/res/values-sw600dp/alias.xml new file mode 100644 index 000000000000..bf3eecb992ba --- /dev/null +++ b/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> |