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

Commit aff614aa authored by Adam Cohen's avatar Adam Cohen Committed by The Android Automerger
Browse files

Fixing up keyguard widget pager layouts 

-> Related to issue 7232481 and issue 7261844

Change-Id: Ib3c15ed78d3473036820bb3061dcd1cd34a2bfc4
parent 6d8f6487

core/res/res/layout-land/keyguard_host_view.xml

+5 −6
Original line number Diff line number Diff line
@@ -28,17 +28,16 @@ 
    android:orientation="horizontal">



    <include layout="@layout/keyguard_widget_region"

        android:layout_width="0dip"

        android:layout_height="230dip"

        android:layout_width="0dp"

        android:layout_weight=".45" />



    <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper

        android:id="@+id/view_flipper"

        android:layout_width="0dip"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="0.55"

        android:layout_marginLeft="8dip"

        android:layout_marginRight="8dip"

        android:layout_marginLeft="8dp"

        android:layout_marginRight="8dp"

        android:gravity="center">



        <!-- SelectorView is always used, so add it here. The rest are loaded dynamically -->

core/res/res/layout/keyguard_selector_view.xml

+1 −4
Original line number Diff line number Diff line
@@ -29,10 +29,7 @@ 
    <include layout="@layout/keyguard_widget_region"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="0.45"

        android:layout_marginTop="35dip"

        android:layout_marginLeft="33dip"

        android:layout_marginRight="33dip"/>

        android:layout_weight="0.45" />



    <RelativeLayout

        android:layout_width="wrap_content"

core/res/res/layout/keyguard_status_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
<!-- This is a view that shows general status information in Keyguard. -->

<com.android.internal.policy.impl.keyguard.KeyguardWidgetFrame

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/keyguard_status_view"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:id="@+id/keyguard_status_view"

    android:gravity="center_horizontal">



    <com.android.internal.policy.impl.keyguard.KeyguardStatusView

core/res/res/layout/keyguard_widget_region.xml

+17 −13
Original line number Diff line number Diff line
@@ -25,43 +25,47 @@ 
        android:visibility="gone"

        android:gravity="center"

        android:orientation="vertical">

    <Space

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1" />

    <com.android.internal.policy.impl.keyguard.KeyguardWidgetPager

        android:id="@+id/app_widget_container"

        android:layout_width="match_parent"

        android:layout_height="@dimen/kg_widget_container_height">

        android:layout_height="0dp"

        android:layout_weight="1"

        android:clipChildren="false"

        android:clipToPadding="false">

            <!-- TODO: Remove this when supported as a widget -->

            <include layout="@layout/keyguard_status_view"/>

            <include layout="@layout/keyguard_transport_control_view"/>

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

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="1"

        android:orientation="horizontal">

        android:layout_height="10dp"

        android:orientation="horizontal"

        android:paddingLeft="@dimen/kg_widget_pager_horizontal_padding"

        android:paddingRight="@dimen/kg_widget_pager_horizontal_padding">

        <com.android.internal.policy.impl.keyguard.KeyguardGlowStripView

            android:id="@+id/left_strip"

            android:layout_width="0dip"

            android:paddingTop="@dimen/kg_runway_lights_vertical_padding"

            android:paddingBottom="@dimen/kg_runway_lights_vertical_padding"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            prvandroid:numDots="5"

            prvandroid:dotSize="7dip"

            prvandroid:dotSize="@dimen/kg_runway_lights_height"

            prvandroid:leftToRight="false"

            prvandroid:glowDot="@*android:drawable/ic_lockscreen_glowdot" />

        <Space

            android:layout_width="0dip"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1.6"/>

        <com.android.internal.policy.impl.keyguard.KeyguardGlowStripView

            android:id="@+id/right_strip"

            android:layout_width="0dip"

            android:paddingTop="@dimen/kg_runway_lights_vertical_padding"

            android:paddingBottom="@dimen/kg_runway_lights_vertical_padding"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            prvandroid:numDots="5"

            prvandroid:dotSize="7dip"

            prvandroid:dotSize="@dimen/kg_runway_lights_height"

            prvandroid:leftToRight="true"

            prvandroid:glowDot="@*android:drawable/ic_lockscreen_glowdot" />

    </LinearLayout>

core/res/res/values/dimens.xml

+14 −5
Original line number Diff line number Diff line
@@ -254,9 +254,6 @@ 
    <!-- Height of widget view in keyguard. -->

    <dimen name="kg_widget_view_height">0dp</dimen>



    <!-- Padding surrounding each widget page -->

    <dimen name="kg_widget_page_padding">10dp</dimen>



    <!-- Size of the clock font in keyguard's status view -->

    <dimen name="kg_status_clock_font_size">94dp</dimen>
@@ -285,8 +282,20 @@ 
    <!-- Space reserved at the bottom of secure views (pin/pattern/password/SIM pin/SIM puk) -->

    <dimen name="kg_secure_padding_height">46dp</dimen>



    <!-- The height of the widget container -->

    <dimen name="kg_widget_container_height">200dp</dimen>

    <!-- The height of the runway lights strip -->

    <dimen name="kg_runway_lights_height">7dp</dimen>



    <!-- The height of the runway lights strip -->

    <dimen name="kg_runway_lights_vertical_padding">3dp</dimen>



    <!-- Horizontal padding for the widget pager -->

    <dimen name="kg_widget_pager_horizontal_padding">16dp</dimen>



    <!-- Top padding for the widget pager -->

    <dimen name="kg_widget_pager_top_padding">16dp</dimen>



    <!-- Bottom padding for the widget pager -->

    <dimen name="kg_widget_pager_bottom_padding">6dp</dimen>



    <!-- Touch slop for the global toggle accessibility gesture -->

    <dimen name="accessibility_touch_slop">80dip</dimen>