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

Commit f5c26017 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Initial changes to stack layout to support paging and nonsquare thumbs."

parents f2d7fa3a 4993c2f1

packages/SystemUI/proguard.flags

+14 −3
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


-keep class com.android.systemui.statusbar.phone.PhoneStatusBar

-keep class com.android.systemui.statusbar.tv.TvStatusBar

-keep class com.android.systemui.recents.*



-keepclassmembers class ** {

    public void onBusEvent(**);
@@ -21,3 +20,15 @@ 
-keepclassmembers class ** extends **.EventBus$InterprocessEvent {

    public <init>(android.os.Bundle);

}



-keep class com.android.systemui.recents.views.StackLayoutAlgorithm {

    public float getFocusState();

    public void setFocusState(float);

}



-keep class com.android.systemui.recents.views.TaskView {

    public int getDim();

    public void setDim(int);

    public float getTaskProgress();

    public void setTaskProgress(float);

}

packages/SystemUI/res/values-land/config.xml

+10 −0
Original line number Diff line number Diff line
@@ -28,4 +28,14 @@ 


    <!-- We have only space for one notification on phone landscape layouts. -->

    <integer name="keyguard_max_notification_count">1</integer>



    <!-- Recents: The relative range of visible tasks from the current scroll position

         while the stack is focused. -->

    <item name="recents_layout_focused_range_min" format="float" type="integer">-2</item>

    <item name="recents_layout_focused_range_max" format="float" type="integer">2</item>



    <!-- Recents: The relative range of visible tasks from the current scroll position

         while the stack is not focused. -->

    <item name="recents_layout_unfocused_range_min" format="float" type="integer">-2</item>

    <item name="recents_layout_unfocused_range_max" format="float" type="integer">1.5</item>

</resources>

packages/SystemUI/res/values-sw600dp/config.xml

+10 −0
Original line number Diff line number Diff line
@@ -32,4 +32,14 @@ 


    <!-- Set to true to enable the user switcher on the keyguard. -->

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



    <!-- Recents: The relative range of visible tasks from the current scroll position

         while the stack is focused. -->

    <item name="recents_layout_focused_range_min" format="float" type="integer">-4</item>

    <item name="recents_layout_focused_range_max" format="float" type="integer">3</item>



    <!-- Recents: The relative range of visible tasks from the current scroll position

         while the stack is not focused. -->

    <item name="recents_layout_unfocused_range_min" format="float" type="integer">-2</item>

    <item name="recents_layout_unfocused_range_max" format="float" type="integer">2.5</item>

</resources>

packages/SystemUI/res/values/config.xml

+10 −0
Original line number Diff line number Diff line
@@ -192,6 +192,16 @@ 
    <!-- Svelte specific logic, see RecentsConfiguration.SVELTE_* constants. -->

    <integer name="recents_svelte_level">0</integer>



    <!-- Recents: The relative range of visible tasks from the current scroll position

         while the stack is focused. -->

    <item name="recents_layout_focused_range_min" format="float" type="integer">-4</item>

    <item name="recents_layout_focused_range_max" format="float" type="integer">3</item>



    <!-- Recents: The relative range of visible tasks from the current scroll position

         while the stack is not focused. -->

    <item name="recents_layout_unfocused_range_min" format="float" type="integer">-2</item>

    <item name="recents_layout_unfocused_range_max" format="float" type="integer">2.5</item>



    <!-- Whether to enable KeyguardService or not -->

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

packages/SystemUI/res/values/dimens.xml

+6 −0
Original line number Diff line number Diff line
@@ -247,6 +247,12 @@ 
    <!-- The amount to allow the stack to overscroll. -->

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



    <!-- The size of the peek area at the top of the stack. -->

    <dimen name="recents_layout_focused_peek_size">@dimen/recents_history_button_height</dimen>



    <!-- The height of the history button. -->

    <dimen name="recents_history_button_height">48dp</dimen>



    <!-- Space reserved for the cards behind the top card in the top stack -->

    <dimen name="top_stack_peek_amount">12dp</dimen>