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

Commit 17c0b752 authored by Michael Bestas's avatar Michael Bestas
Browse files

Lockscreen Media controls: Fix mdpi layout issues 

Before: http://i.imgur.com/56jXhXG.png
After: http://i.imgur.com/wQJV3M1.png



Signed-off-by: default avatarkyryljan-serhij <kirilyan.sergei@gmail.com>
Signed-off-by: default avatarMichael Bestas <mikeioannina@gmail.com>

Change-Id: Ib3f23a8e2d7e545495d78fe3e6b5a5b8d0adfac9
parent a10f281d

core/res/res/layout-mdpi/keyguard_screen_tab_unlock.xml

0 → 100644
+368 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

**

** Copyright 2009, The Android Open Source Project

** Copyright 2012, The CyanogenMod Project (Weather, Calendar)

**

** 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 the general lock screen which shows information about the

  state of the device, as well as instructions on how to get past it

  depending on the state of the device.  It is the same for landscape

  and portrait.-->

<GridLayout

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

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:id="@+id/root"

    android:gravity="center_horizontal">



    <com.android.internal.widget.DigitalClock android:id="@+id/time"

        android:layout_marginTop="@dimen/keyguard_lockscreen_status_line_clockfont_top_margin"

        android:layout_marginBottom="12dip"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

        top of the other. Hence the redundant layout... -->

        <TextView android:id="@+id/timeDisplayBackground"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="none"

            android:textSize="@dimen/keyguard_lockscreen_clock_font_size"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:layout_marginBottom="6dip"

            android:textColor="@color/lockscreen_clock_background"

            />



        <TextView android:id="@+id/timeDisplayForeground"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="none"

            android:textSize="@dimen/keyguard_lockscreen_clock_font_size"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:layout_marginBottom="6dip"

            android:textColor="@color/lockscreen_clock_foreground"

            android:layout_alignLeft="@id/timeDisplayBackground"

            android:layout_alignTop="@id/timeDisplayBackground"

            />



    </com.android.internal.widget.DigitalClock>



    <LinearLayout

        android:id="@+id/date_line"

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="wrap_content">



        <TextView

            android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

            />



        <TextView

            android:id="@+id/alarm_status"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginLeft="16dip"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

            android:drawablePadding="4dip"

            />



    </LinearLayout>



    <TextView

        android:id="@+id/status1"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

        android:drawablePadding="4dip"

        />



    <!-- CyanogenMod Weather Panel -->

    <RelativeLayout

        android:id="@+id/weather_panel"

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:paddingTop="4dip" >



        <ImageView

            android:id="@+id/weather_image"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_centerHorizontal="true"

            android:layout_centerVertical="true"

            android:paddingLeft="8dip"

            android:paddingRight="8dip"

            android:src="@android:drawable/ic_dialog_alert" />



        <RelativeLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_centerVertical="true"

            android:layout_toLeftOf="@id/weather_image"

            android:orientation="horizontal"

            android:padding="4dip" >



            <TextView

                android:id="@+id/weather_city"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textSize="14sp"

                android:textStyle="bold"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textColor="?android:attr/textColorPrimary"/>



            <TextView

                android:id="@+id/weather_condition"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_below="@id/weather_city"

                android:layout_alignParentRight="true"

                android:gravity="right"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textSize="12sp"

                android:textColor="?android:attr/textColorPrimary" />



            <TextView

                android:id="@+id/update_time"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="right"

                android:layout_below="@id/weather_condition"

                android:layout_alignParentRight="true"

                android:textSize="8sp"

                android:textColor="?android:attr/textColorSecondary" />



        </RelativeLayout>



        <RelativeLayout

            android:id="@+id/weather_temps_panel"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toRightOf="@id/weather_image"

            android:orientation="horizontal"

            android:layout_centerVertical="true" >



            <TextView

                android:id="@+id/weather_temp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_centerHorizontal="true"

                android:textSize="20sp"

                android:textColor="?android:attr/textColorPrimary" />



            <View

                android:id="@+id/weather_divider"

                android:layout_below="@id/weather_temp"

                android:layout_width="44dip"

                android:layout_height="1dip"

                android:background="@android:drawable/divider_horizontal_dark" />



            <TextView

                android:id="@+id/weather_low_high"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_below="@id/weather_divider"

                android:layout_centerHorizontal="true"

                android:paddingTop="2dip"

                android:textSize="12sp"

                android:textColor="?android:attr/textColorPrimary" />



        </RelativeLayout>



    </RelativeLayout>



    <Space android:layout_gravity="fill" />



    <!-- emergency call button shown when sim is PUKd and tab_selector is hidden -->

    <Button

        android:id="@+id/emergencyCallButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="4dip"

        android:layout_marginRight="16dip"

        android:layout_gravity="right"

        android:drawableLeft="@*android:drawable/lockscreen_emergency_button"

        style="?android:attr/buttonBarButtonStyle"

        android:drawablePadding="4dip"

        android:text="@*android:string/lockscreen_emergency_call"

        android:visibility="gone"

        />



    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="250dip">



    <!-- CyanogenMod Calendar Panel -->

    <LinearLayout

        android:id="@+id/calendar_panel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="28dip"

        android:gravity="center_vertical"

        android:paddingLeft="12dip"

        android:paddingRight="12dip" >



        <ImageView

            android:layout_width="36dp"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:gravity="center"

            android:src="@drawable/ic_lock_idle_calendar" />



        <View

            android:layout_width="1dip"

            android:layout_height="match_parent"

            android:paddingTop="6dip"

            android:paddingBottom="6dip"

            android:background="@android:drawable/divider_horizontal_dark" />



        <RelativeLayout

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:paddingTop="6dip"

            android:paddingBottom="6dip"

            android:paddingLeft="4dip" >



            <TextView

                android:id="@+id/calendar_event_title"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:singleLine="true"

                android:textSize="14sp"

                android:textColor="?android:attr/textColorPrimary"

                android:ellipsize="marquee"

                android:fadingEdge="horizontal" />



            <TextView

                android:id="@+id/calendar_event_details"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_below="@id/calendar_event_title"

                android:layout_alignLeft="@id/calendar_event_title"

                android:textSize="12sp"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:marqueeRepeatLimit="marquee_forever"

                android:scrollHorizontally="true"

                android:focusable="true"

                android:focusableInTouchMode="true"

                android:fadingEdge="horizontal"

                android:textColor="?android:attr/textColorSecondary" />



        </RelativeLayout>



    </LinearLayout>



        <com.android.internal.widget.multiwaveview.GlowPadView

            android:id="@+id/unlock_widget"

            android:orientation="horizontal"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

            android:layout_centerHorizontal="true"

            android:layout_centerVertical="true"

            android:paddingLeft="8dip"

            android:paddingRight="8dip"

            android:focusable="true"

            android:layout_marginTop="-70dip"



            android:targetDrawables="@array/lockscreen_targets_with_camera"

            android:targetDescriptions="@array/lockscreen_target_descriptions_with_camera"

            android:directionDescriptions="@array/lockscreen_direction_descriptions"

            android:handleDrawable="@drawable/ic_lockscreen_handle"

            android:outerRingDrawable="@drawable/ic_lockscreen_outerring"

            android:outerRadius="@dimen/glowpadview_target_placement_radius"

            android:innerRadius="@dimen/glowpadview_inner_radius"

            android:snapMargin="@dimen/glowpadview_snap_margin"

            android:feedbackCount="1"

            android:vibrationDuration="20"

            android:glowRadius="@dimen/glowpadview_glow_radius"

            android:pointDrawable="@drawable/ic_lockscreen_glowdot"

            />



        <TextView

            android:id="@+id/carrier"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content"

            android:layout_alignParentBottom="true"

            android:layout_marginBottom="12dip"

            android:gravity="center_horizontal"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

            android:textColor="?android:attr/textColorSecondary"

            />



    </RelativeLayout>



    <LinearLayout

        android:orientation="horizontal"

        android:layout_width="match_parent"

        style="?android:attr/buttonBarStyle"

        android:gravity="center"

        android:weightSum="2">



        <Button android:id="@+id/emergencyCallButton"

            android:layout_gravity="center_horizontal"

            android:layout_width="0dip"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            style="?android:attr/buttonBarButtonStyle"

            android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"

            android:text="@*android:string/lockscreen_emergency_call"

            android:drawableLeft="@*android:drawable/lockscreen_emergency_button"

            android:drawablePadding="0dip"

            android:visibility="gone"

        />



    </LinearLayout>



    <!-- Music transport control -->

    <include android:id="@+id/transport"

        layout="@layout/keyguard_transport_control"

        android:layout_row="0"

        android:layout_column="0"

        android:layout_rowSpan="5"

        android:layout_columnSpan="1"

        android:layout_gravity="fill"

        android:layout_width="0dip"

        android:layout_height="0dip"

        />



</GridLayout>