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

Commit 476fceab authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Merge 5418dd92 

Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
parents 58ed5d74 5418dd92

core/res/res/layout/keyguard_widget_remove_drop_target.xml

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
    android:paddingRight="40dp"

    android:drawableLeft="@drawable/kg_widget_delete_drop_target"

    android:drawablePadding="4dp"

    android:text="@string/kg_reordering_delete_drop_target_text"

    android:textColor="#FFF"

    android:textSize="13sp"

    android:shadowColor="#000"

core/res/res/values-land/bools.xml

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<resources>

    <bool name="kg_enable_camera_default_widget">false</bool>

    <bool name="kg_top_align_page_shrink_on_bouncer_visible">true</bool>

    <bool name="kg_share_status_area">false</bool>

    <bool name="kg_sim_puk_account_full_screen">false</bool>

</resources>

core/res/res/values-sw600dp/bools.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ 
    <!-- No camera for you, tablet user -->

    <bool name="kg_enable_camera_default_widget">false</bool>

    <bool name="kg_center_small_widgets_vertically">true</bool>

    <bool name="kg_top_align_page_shrink_on_bouncer_visible">false</bool>

</resources>

core/res/res/values/bools.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<resources>

    <bool name="kg_enable_camera_default_widget">true</bool>

    <bool name="kg_center_small_widgets_vertically">false</bool>

    <bool name="kg_top_align_page_shrink_on_bouncer_visible">true</bool>

    <bool name="action_bar_embed_tabs">true</bool>

    <bool name="action_bar_embed_tabs_pre_jb">false</bool>

    <bool name="split_action_bar_is_narrow">true</bool>

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3972,6 +3972,8 @@ 
    <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash

         with spaces on either side. [CHAR LIMIT=3] -->

    <string name="kg_text_message_separator" product="default"> \u2014 </string>

    <!-- The delete-widget drop target button text -->

    <string name="kg_reordering_delete_drop_target_text">Remove</string>



    <!-- Message shown in dialog when user is attempting to set the music volume above the

    recommended maximum level for headphones -->