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

Commit 79e0f875 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev

parents af0d09be 6f72b1c9

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

+1 −0
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@ 
    <bool name="kg_sim_puk_account_full_screen">false</bool>

    <!-- No camera for you, tablet user -->

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

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

</resources>

core/res/res/values/bools.xml

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


<resources>

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

    <bool name="kg_center_small_widgets_vertically">false</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/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -335,4 +335,9 @@ 
    due to the appearance of the IME), then drop the multiuser selector. -->

    <dimen name="kg_squashed_layout_threshold">600dp</dimen>



    <!-- The height of widgets which do not support vertical resizing. This is only

    used on tablets; on phones, this size is determined by the space left by the

    security mode. -->

    <dimen name="kg_small_widget_height">160dp</dimen>



</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -1216,6 +1216,7 @@ 
  <java-symbol type="bool" name="kg_share_status_area" />

  <java-symbol type="bool" name="kg_sim_puk_account_full_screen" />

  <java-symbol type="bool" name="target_honeycomb_needs_options_menu" />

  <java-symbol type="bool" name="kg_center_small_widgets_vertically" />

  <java-symbol type="color" name="kg_multi_user_text_active" />

  <java-symbol type="color" name="kg_multi_user_text_inactive" />

  <java-symbol type="color" name="kg_widget_pager_gradient" />
@@ -1235,6 +1236,7 @@ 
  <java-symbol type="dimen" name="keyguard_avatar_frame_shadow_radius" />

  <java-symbol type="dimen" name="kg_edge_swipe_region_size" />

  <java-symbol type="dimen" name="kg_squashed_layout_threshold" />

  <java-symbol type="dimen" name="kg_small_widget_height" />

  <java-symbol type="drawable" name="ic_jog_dial_sound_off" />

  <java-symbol type="drawable" name="ic_jog_dial_sound_on" />

  <java-symbol type="drawable" name="ic_jog_dial_unlock" />

policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetFrame.java

+4 −0
Original line number Diff line number Diff line
@@ -112,6 +112,10 @@ public class KeyguardWidgetFrame extends FrameLayout { 


        mFrameStrokeAdjustment = (int) (2 * density);



        // This will be overriden on phones based on the current security mode, however on tablets

        // we need to specify a height.

        mSmallWidgetHeight =

                res.getDimensionPixelSize(com.android.internal.R.dimen.kg_small_widget_height);

        mBackgroundDrawable = res.getDrawable(R.drawable.kg_bouncer_bg_white);

        mGradientColor = res.getColor(com.android.internal.R.color.kg_widget_pager_gradient);

        mGradientPaint.setXfermode(sAddBlendMode);