Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf19fa4f authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Move bouncer to the bottom, but only on phones."

parents c99a9b28 9a6eba3c
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -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>
+21 −0
Original line number Diff line number Diff line
<!--
  ~ 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
+5 −0
Original line number Diff line number Diff line
@@ -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>