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

Commit dcba2acd authored by Christian Göllner's avatar Christian Göllner Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-3bd174ffe2b040e3952f38ca47423e3e" into tm-mainline-prod 

* changes:
  [automerge] [Motion] Split-shade transition on LS: add an overshoot/overscroll effect 2p: 752f82ea
  [Motion] Split-shade transition on LS: add an overshoot/overscroll effect
parents e21482f6 eda2372d

packages/SystemUI/plugin/src/com/android/systemui/plugins/qs/QS.java

+5 −0
Original line number Diff line number Diff line
@@ -122,6 +122,11 @@ public interface QS extends FragmentBase { 
     */

    default void setScrollListener(ScrollListener scrollListener) {}



    /**

     * Sets the amount of vertical over scroll that should be performed on QS.

     */

    default void setOverScrollAmount(int overScrollAmount) {}



    /**

     * Callback for when QSPanel container is scrolled

     */

packages/SystemUI/res/values-sw600dp-land/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ 


    <dimen name="status_bar_header_height_keyguard">42dp</dimen>



    <dimen name="lockscreen_shade_max_over_scroll_amount">32dp</dimen>



    <!-- Distance that the full shade transition takes in order to complete by tapping on a button

         like "expand". -->

    <dimen name="lockscreen_shade_transition_by_tap_distance">200dp</dimen>

packages/SystemUI/res/values-sw600dp-land/integers.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

 * Copyright (c) 2006, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

*/

-->

<resources>

    <integer name="lockscreen_shade_over_scroll_release_duration">500</integer>

</resources>
 
 No newline at end of file

packages/SystemUI/res/values-sw720dp-land/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -26,4 +26,6 @@ 
    <dimen name="status_bar_header_height_keyguard">56dp</dimen>



    <dimen name="qs_media_session_height_expanded">251dp</dimen>



    <dimen name="lockscreen_shade_max_over_scroll_amount">42dp</dimen>

</resources>

packages/SystemUI/res/values/dimens.xml

+2 −3
Original line number Diff line number Diff line
@@ -1174,9 +1174,8 @@ 
         the shade -->

    <dimen name="lockscreen_shade_media_transition_distance">120dp</dimen>



    <!-- Maximum overshoot for the topPadding of notifications when transitioning to the full

         shade -->

    <dimen name="lockscreen_shade_notification_movement">24dp</dimen>

    <!-- Maximum over scroll amount for the shade when transition to the full shade. -->

    <dimen name="lockscreen_shade_max_over_scroll_amount">24dp</dimen>



    <!-- Maximum overshoot for the pulse expansion -->

    <dimen name="pulse_expansion_max_top_overshoot">32dp</dimen>