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

Commit bd8c736b authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset /... 

am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev

* commit '79d4bf6e':
  Fixing up overscroll asset / sizing
parents 2a72038a 79d4bf6e

core/res/res/drawable-hdpi/kg_widget_bg_padded.9.png

0 → 100644
+3.2 KiB
Loading image diff...

core/res/res/drawable-mdpi/kg_widget_bg_padded.9.png

0 → 100644
+3.08 KiB
Loading image diff...

core/res/res/drawable-xhdpi/kg_widget_bg_padded.9.png

0 → 100644
+3.39 KiB
Loading image diff...

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,7 @@ 
  <java-symbol type="drawable" name="magnified_region_frame" />

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

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

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

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

  <java-symbol type="id" name="action_mode_bar_stub" />

  <java-symbol type="id" name="alarm_status" />

  <java-symbol type="id" name="backspace" />

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

+6 −2
Original line number Diff line number Diff line
@@ -220,7 +220,9 @@ public class KeyguardViewStateManager implements 
                    mKeyguardWidgetPager.setWidgetToResetOnPageFadeOut(mPageListeningToSlider);

                }

            }

            if (scrollState != SlidingChallengeLayout.SCROLL_STATE_FADING) {

                frame.hideFrame(this);

            }

            updateEdgeSwiping();



            if (mChallengeLayout.isChallengeShowing()) {
@@ -239,7 +241,9 @@ public class KeyguardViewStateManager implements 


            // Skip showing the frame and shrinking the widget if we are

            if (!mChallengeLayout.isBouncing()) {

                if (scrollState != SlidingChallengeLayout.SCROLL_STATE_FADING) {

                    frame.showFrame(this);

                }



                // As soon as the security begins sliding, the widget becomes small (if it wasn't

                // small to begin with).