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

Commit aabdff83 authored by Winson's avatar Winson Committed by android-build-merger
Browse files

Merge changes I1bad66e2,Ibc93597e,Id985fc28 into nyc-dev 

am: fef8cfc3

* commit 'fef8cfc3':
  Remove the highlight on the overview button in the screen pinning dialog
  Fixing bad regression in alt-tab layout.
  Workaround to ensure that a SystemUI process is always available.

Change-Id: I7072dc07c1e034d568df14a0b9a12134b24f823b
parents 993d178e fef8cfc3

packages/SystemUI/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -184,6 +184,14 @@ 
            android:exported="true"

            />



        <!-- Recents depends on every user having their own SystemUI process, so on user switch,

             ensure that the process is created by starting this service.

             -->

        <service android:name="SystemUISecondaryUserService"

            android:exported="true"

            android:permission="com.android.systemui.permission.SELF" />





        <!-- started from PhoneWindowManager

             TODO: Should have an android:permission attribute -->

        <service android:name=".screenshot.TakeScreenshotService"

packages/SystemUI/res/layout/screen_pinning_request_buttons.xml

+0 −15
Original line number Diff line number Diff line
@@ -109,21 +109,6 @@ 
        android:paddingStart="@dimen/screen_pinning_request_frame_padding"

        android:paddingEnd="@dimen/screen_pinning_request_frame_padding" >



        <ImageView

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:scaleType="matrix"

            android:src="@drawable/screen_pinning_light_bg_circ" />



        <ImageView

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:paddingEnd="@dimen/screen_pinning_request_inner_padding"

            android:paddingStart="@dimen/screen_pinning_request_inner_padding"

            android:paddingTop="@dimen/screen_pinning_request_inner_padding"

            android:scaleType="matrix"

            android:src="@drawable/screen_pinning_bg_circ" />



        <ImageView

            android:layout_width="match_parent"

            android:layout_height="match_parent"

packages/SystemUI/res/layout/screen_pinning_request_buttons_land.xml

+0 −15
Original line number Diff line number Diff line
@@ -40,21 +40,6 @@ 
        android:layout_width="@dimen/screen_pinning_request_button_height"

        android:layout_weight="0" >



        <ImageView

            android:layout_height="match_parent"

            android:layout_width="match_parent"

            android:scaleType="matrix"

            android:src="@drawable/screen_pinning_light_bg_circ" />



        <ImageView

            android:layout_height="match_parent"

            android:layout_width="match_parent"

            android:scaleType="matrix"

            android:paddingLeft="@dimen/screen_pinning_request_inner_padding"

            android:paddingTop="@dimen/screen_pinning_request_inner_padding"

            android:paddingBottom="@dimen/screen_pinning_request_inner_padding"

            android:src="@drawable/screen_pinning_bg_circ" />



        <ImageView

            android:layout_height="match_parent"

            android:layout_width="match_parent"

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,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">-3</item>

    <item name="recents_layout_focused_range_max" 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

         while the stack is not focused. -->

packages/SystemUI/src/com/android/systemui/SystemUIApplication.java

+11 −0
Original line number Diff line number Diff line
@@ -123,6 +123,17 @@ public class SystemUIApplication extends Application { 
        startServicesIfNeeded(SERVICES);

    }



    /**

     * Ensures that all the Secondary user SystemUI services are running. If they are already

     * running, this is a no-op. This is needed to conditinally start all the services, as we only

     * need to have it in the main process.

     *

     * <p>This method must only be called from the main thread.</p>

     */

    void startSecondaryUserServicesIfNeeded() {

        startServicesIfNeeded(SERVICES_PER_USER);

    }



    private void startServicesIfNeeded(Class<?>[] services) {

        if (mServicesStarted) {

            return;