diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-17 21:44:53 +0200 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2014-04-17 21:44:53 +0200 |
| commit | 9a6eba3ce71258a9f47c958a1da8e7626af916c7 (patch) | |
| tree | f3c1df6328b3f9d56df55a8461392f8c91dfb05b | |
| parent | 56d46cc95f761eabc6455f3e391835936b7d05e8 (diff) | |
| download | frameworks_base-9a6eba3ce71258a9f47c958a1da8e7626af916c7.zip frameworks_base-9a6eba3ce71258a9f47c958a1da8e7626af916c7.tar.gz frameworks_base-9a6eba3ce71258a9f47c958a1da8e7626af916c7.tar.bz2 | |
Move bouncer to the bottom, but only on phones.
Change-Id: Ibe03964a10a8cab9e179ff0618a6ed312c8b1b4a
| -rw-r--r-- | packages/Keyguard/res/layout/keyguard_bouncer.xml | 8 | ||||
| -rw-r--r-- | packages/Keyguard/res/values-sw600dp/styles.xml | 21 | ||||
| -rw-r--r-- | packages/Keyguard/res/values/styles.xml | 5 |
3 files changed, 31 insertions, 3 deletions
diff --git a/packages/Keyguard/res/layout/keyguard_bouncer.xml b/packages/Keyguard/res/layout/keyguard_bouncer.xml index dedf427..8716ebc 100644 --- a/packages/Keyguard/res/layout/keyguard_bouncer.xml +++ b/packages/Keyguard/res/layout/keyguard_bouncer.xml @@ -24,8 +24,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - <include layout="@layout/keyguard_simple_host_view" - android:layout_width="match_parent" - android:layout_height="match_parent"/> + <include + style="@style/BouncerSecurityContainer" + layout="@layout/keyguard_simple_host_view" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> </FrameLayout> diff --git a/packages/Keyguard/res/values-sw600dp/styles.xml b/packages/Keyguard/res/values-sw600dp/styles.xml new file mode 100644 index 0000000..e632e76 --- /dev/null +++ b/packages/Keyguard/res/values-sw600dp/styles.xml @@ -0,0 +1,21 @@ +<!-- + ~ Copyright (C) 2014 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> + <style name="BouncerSecurityContainer"> + <item name="android:layout_gravity">center</item> + </style> +</resources>
\ No newline at end of file diff --git a/packages/Keyguard/res/values/styles.xml b/packages/Keyguard/res/values/styles.xml index 4a034aa..b54ac50 100644 --- a/packages/Keyguard/res/values/styles.xml +++ b/packages/Keyguard/res/values/styles.xml @@ -81,4 +81,9 @@ <item name="android:mirrorForRtl">true</item> </style> + <style name="BouncerSecurityContainer"> + <item name="android:layout_marginBottom">32dp</item> + <item name="android:layout_gravity">center_horizontal|bottom</item> + </style> + </resources> |