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

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

Merge "Adding tuner params for paging and full screen thumbnails."

parents f5c26017 8b1871d7

core/java/android/view/IWindowManager.aidl

+5 −1
Original line number Diff line number Diff line
@@ -289,8 +289,12 @@ interface IWindowManager 


    /**

     * Create a screenshot of the applications currently displayed.

     *

     * @param frameScale the scale to apply to the frame, only used when width = -1 and 

     *                   height = -1

     */

    Bitmap screenshotApplications(IBinder appToken, int displayId, int maxWidth, int maxHeight);

    Bitmap screenshotApplications(IBinder appToken, int displayId, int maxWidth, int maxHeight, 

            float frameScale);



    /**

     * Called by the status bar to notify Views of changes to System UI visiblity.

packages/SystemUI/proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    public <init>(android.os.Bundle);

}



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

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

    public float getFocusState();

    public void setFocusState(float);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


    <!-- 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_min" format="float" type="integer">-3</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

packages/SystemUI/res/values/strings.xml

+11 −1
Original line number Diff line number Diff line
@@ -1159,10 +1159,20 @@ 
    <!-- Option to use new paging layout in quick settings [CHAR LIMIT=60] -->

    <string name="qs_paging" translatable="false">Use the new Quick Settings</string>



    <!-- Toggles paging recents via the recents button -->

    <string name="overview_page_on_toggle">Enable paging</string>

    <!-- Description for the toggle for fast-toggling recents via the recents button -->

    <string name="overview_page_on_toggle_desc">Enable paging via the Overview button</string>



    <!-- Toggles fast-toggling recents via the recents button -->

    <string name="overview_fast_toggle_via_button">Enable fast toggle</string>

    <!-- Description for the toggle for fast-toggling recents via the recents button -->

    <string name="overview_fast_toggle_via_button_desc">Enable paging via the Overview button</string>

    <string name="overview_fast_toggle_via_button_desc">Enable launch timeout while paging</string>



    <!-- Toggles fullscreen screenshots -->

    <string name="overview_fullscreen_thumbnails">Enable fullscreen screenshots</string>

    <!-- Description for the toggle for fullscreen screenshots -->

    <string name="overview_fullscreen_thumbnails_desc">Enable fullscreen screenshots in Overview</string>



    <!-- Category in the System UI Tuner settings, where new/experimental

         settings are -->

packages/SystemUI/res/xml/tuner_prefs.xml

+10 −0
Original line number Diff line number Diff line
@@ -87,11 +87,21 @@ 
    <PreferenceScreen

        android:title="@string/overview" >



        <com.android.systemui.tuner.TunerSwitch

            android:key="overview_page_on_toggle"

            android:title="@string/overview_page_on_toggle"

            android:summary="@string/overview_page_on_toggle_desc" />



        <com.android.systemui.tuner.TunerSwitch

            android:key="overview_fast_toggle"

            android:title="@string/overview_fast_toggle_via_button"

            android:summary="@string/overview_fast_toggle_via_button_desc" />



        <com.android.systemui.tuner.TunerSwitch

            android:key="overview_fullscreen_thumbnails"

            android:title="@string/overview_fullscreen_thumbnails"

            android:summary="@string/overview_fullscreen_thumbnails_desc" />



    </PreferenceScreen>



    <SwitchPreference