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

Commit d727cf7e authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

Merge "Port recent apps from tablet to phone"

parents 81d7848f 3b1fc47d

core/java/com/android/internal/statusbar/IStatusBar.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,5 +35,6 @@ oneway interface IStatusBar 
    void setImeWindowStatus(in IBinder token, int vis, int backDisposition);

    void setImeWindowStatus(in IBinder token, int vis, int backDisposition);

    void setHardKeyboardStatus(boolean available, boolean enabled);

    void setHardKeyboardStatus(boolean available, boolean enabled);

    void userActivity();

    void userActivity();

    void toggleRecentApps();

}

}

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -47,4 +47,5 @@ interface IStatusBarService 
    void setSystemUiVisibility(int vis);

    void setSystemUiVisibility(int vis);

    void setHardKeyboardEnabled(boolean enabled);

    void setHardKeyboardEnabled(boolean enabled);

    void userActivity();

    void userActivity();

    void toggleRecentApps();

}
 
}

core/res/res/values/config.xml

+4 −2
Original line number Original line Diff line number Diff line
@@ -389,9 +389,11 @@ 
    <!-- Control the behavior when the user long presses the power button.

    <!-- Control the behavior when the user long presses the power button.

            0 - Nothing

            0 - Nothing

            1 - Recent apps dialog

            1 - Recent apps dialog

            2 - Recent apps activity in SystemUI

            2 - Recent apps view in SystemUI

         This needs to match the constants in

         policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

    -->

    -->

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

    <integer name="config_longPressOnHomeBehavior">2</integer>





    <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.

    <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.

         The N entries of this array define N + 1 zones as follows:

         The N entries of this array define N + 1 zones as follows:

packages/SystemUI/AndroidManifest.xml

+0 −7
Original line number Original line Diff line number Diff line
@@ -33,13 +33,6 @@ 
                android:excludeFromRecents="true">

                android:excludeFromRecents="true">

        </activity>

        </activity>





        <activity android:name=".recent.RecentApplicationsActivity"

            android:theme="@android:style/Theme.NoTitleBar"

            android:excludeFromRecents="true"

            android:launchMode="singleInstance"

            android:exported="true">

        </activity>



        <!-- started from UsbDeviceSettingsManager -->

        <!-- started from UsbDeviceSettingsManager -->

        <activity android:name=".usb.UsbConfirmActivity"

        <activity android:name=".usb.UsbConfirmActivity"

            android:exported="true"

            android:exported="true"

packages/SystemUI/res/drawable-hdpi/recents_thumbnail_bg.png

−2.18 KiB (1.71 KiB)
Loading image diff...