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

Commit dc4fd3c8 authored by Daniel Sandler's avatar Daniel Sandler Committed by android-build-merger
Browse files

Merge "Quick fix to lockscreen text color." into oc-dev 

am: f06c2a01

Change-Id: If3ec3b915bb2defe9999b323bf7f7ce2c55ff7be
parents 57fb5872 f06c2a01

packages/SystemUI/res-keyguard/layout/keyguard_emergency_carrier_area.xml

+2 −7
Original line number Diff line number Diff line
@@ -32,10 +32,8 @@ 
        android:id="@+id/carrier_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        style="@style/Keyguard.TextView"

        android:ellipsize="marquee"

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

        android:textSize="@dimen/kg_status_line_font_size"

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

        android:visibility="gone"

        androidprv:allCaps="@bool/kg_use_all_caps" />
@@ -46,10 +44,7 @@ 
        android:layout_weight="1"

        android:layout_marginTop="@dimen/eca_overlap"

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

        style="?android:attr/buttonBarButtonStyle"

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

        android:textSize="@dimen/kg_status_line_font_size"

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

        style="@style/Keyguard.TextView.EmergencyButton"

        android:textAllCaps="@bool/kg_use_all_caps" />



</com.android.keyguard.EmergencyCarrierArea>

packages/SystemUI/res-keyguard/layout/keyguard_message_area.xml

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

    android:layout_height="wrap_content"

    android:gravity="center"

    style="@style/Keyguard.TextView"

    android:id="@+id/keyguard_message_area"

    android:singleLine="true"

    android:ellipsize="marquee"

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

    android:textSize="@dimen/kg_status_line_font_size"

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

    android:focusable="true" />

packages/SystemUI/res-keyguard/values/styles.xml

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,15 @@ 


<resources>

    <!-- Keyguard PIN pad styles -->

    <style name="Keyguard.TextView" parent="@android:style/Widget.DeviceDefault.TextView">

        <item name="android:textColor">@*android:color/primary_device_default_light</item>

        <item name="android:textSize">@dimen/kg_status_line_font_size</item>

    </style>

    <style name="Keyguard.TextView.EmergencyButton" parent="@android:style/DeviceDefault.ButtonBar">

        <item name="android:textColor">@*android:color/primary_device_default_light</item>

        <item name="android:textSize">@dimen/kg_status_line_font_size</item>

        <item name="android:background">@null</item>

    </style>

    <style name="Widget.TextView.NumPadKey" parent="@android:style/Widget.TextView">

        <item name="android:singleLine">true</item>

        <item name="android:gravity">center_horizontal|center_vertical</item>