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

Commit 282b530c authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 1b22d8b8: am a1a51272: am 8dd3aadd: Merge "Align carrier info for glowpad... 

am 1b22d8b8: am a1a51272: am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev

* commit '1b22d8b8':
  Align carrier info for glowpad keyguard screen
parents c54f3ead 1b22d8b8

core/res/res/layout/keyguard_emergency_carrier_area.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:gravity="center_horizontal"

    android:gravity="center"

    android:layout_gravity="center_horizontal"

    android:layout_alignParentBottom="true">

core/res/res/layout/keyguard_selector_view.xml

+2 −4
Original line number Diff line number Diff line
@@ -41,10 +41,8 @@ 
        <include layout="@layout/keyguard_emergency_carrier_area"

            android:id="@+id/keyguard_selector_fade_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_gravity="bottom|center_horizontal"

            android:gravity="center_horizontal" />

            android:layout_height="48dp"

            android:layout_gravity="bottom|center_horizontal" />

    </FrameLayout>



</com.android.internal.policy.impl.keyguard.KeyguardSelectorView>