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

Commit 8531a0be authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am 1ed908ec: am 193cd46c: am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME... 

am 1ed908ec: am 193cd46c: am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev

* commit '1ed908ec':
  Don't pop the IME for passwors at ScreenOn on tablets.
parents a2e07821 1ed908ec

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
    <bool name="show_ongoing_ime_switcher">true</bool>

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

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

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

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

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

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

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

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

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

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

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

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

core/res/res/values/bools.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
    <bool name="kg_enable_camera_default_widget">true</bool>

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

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

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

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

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

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

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

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

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

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

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

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

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -1218,6 +1218,7 @@ 
  <java-symbol type="bool" name="kg_top_align_page_shrink_on_bouncer_visible" />

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

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

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

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

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

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

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

  <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_multi_user_text_inactive" />

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

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

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -215,7 +215,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 
    }

    }





    @Override

    @Override

    public void onResume() {

    public void onResume(int reason) {

        reset();

        reset();

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -314,7 +314,7 @@ public class KeyguardAccountView extends LinearLayout implements KeyguardSecurit 
    }

    }





    @Override

    @Override

    public void onResume() {

    public void onResume(int reason) {

        reset();

        reset();

    }

    }