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

Commit 8c773c8c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6523363 from edf37f7d to mainline-release 

Change-Id: I127797198dcd80e015d4d4bf3922d8da2ce90a67
parents 6e8483f3 edf37f7d

packages/Shell/src/com/android/shell/BugreportProgressService.java

+6 −4
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ public class BugreportProgressService extends Service { 
            return;

        }

        ParcelFileDescriptor screenshotFd = null;

        if (isDefaultScreenshotRequired(bugreportType)) {

        if (isDefaultScreenshotRequired(bugreportType, /* hasScreenshotButton= */ !mIsTv)) {

            screenshotFd = info.getDefaultScreenshotFd();

            if (screenshotFd == null) {

                Log.e(TAG, "Failed to start bugreport generation as"
@@ -651,10 +651,12 @@ public class BugreportProgressService extends Service { 
    }



    private static boolean isDefaultScreenshotRequired(

            @BugreportParams.BugreportMode int bugreportType) {

            @BugreportParams.BugreportMode int bugreportType,

            boolean hasScreenshotButton) {

        // Modify dumpstate#SetOptionsFromMode as well for default system screenshots.

        // We override dumpstate for interactive bugreports.

        return bugreportType == BugreportParams.BUGREPORT_MODE_FULL

        // We override dumpstate for interactive bugreports with a screenshot button.

        return (bugreportType == BugreportParams.BUGREPORT_MODE_INTERACTIVE && !hasScreenshotButton)

                || bugreportType == BugreportParams.BUGREPORT_MODE_FULL

                || bugreportType == BugreportParams.BUGREPORT_MODE_WEAR;

    }

packages/SystemUI/res/layout/media_carousel.xml

+26 −9
Original line number Diff line number Diff line
@@ -16,10 +16,17 @@ 
  -->



<!-- Carousel for media controls -->

<com.android.systemui.media.UnboundHorizontalScrollView

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:clipChildren="false"

    android:clipToPadding="false"

    >

    <com.android.systemui.media.UnboundHorizontalScrollView

        android:id="@+id/media_carousel_scroller"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:scrollbars="none"

        android:clipChildren="false"

        android:clipToPadding="false"
@@ -35,3 +42,13 @@ 
            <!-- QSMediaPlayers will be added here dynamically -->

        </LinearLayout>

    </com.android.systemui.media.UnboundHorizontalScrollView>

    <com.android.systemui.qs.PageIndicator

        android:id="@+id/media_page_indicator"

        android:layout_width="wrap_content"

        android:layout_height="48dp"

        android:layout_marginBottom="4dp"

        android:layout_gravity="center_horizontal|bottom"

        android:gravity="center"

        android:tint="@color/media_primary_text"

    />

</FrameLayout>

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,9 @@ 
    <!-- The corner radius for PiP window. -->

    <dimen name="pip_corner_radius">8dp</dimen>



    <!-- The buffer to use when calculating whether the pip is in an adjust zone. -->

    <dimen name="pip_bottom_offset_buffer">1dp</dimen>



    <dimen name="default_gear_space">18dp</dimen>

    <dimen name="cell_overlay_padding">18dp</dimen>

packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt

+7 −2
Original line number Diff line number Diff line
@@ -199,12 +199,17 @@ class MediaDataManager @Inject constructor( 
        val actionIcons: MutableList<MediaAction> = ArrayList()

        val actions = notif.actions

        val actionsToShowCollapsed = notif.extras.getIntArray(

                Notification.EXTRA_COMPACT_ACTIONS)?.toList() ?: emptyList()

                Notification.EXTRA_COMPACT_ACTIONS)?.toMutableList() ?: mutableListOf<Int>()

        // TODO: b/153736623 look into creating actions when this isn't a media style notification



        val packageContext: Context = sbn.getPackageContext(context)

        if (actions != null) {

            for (action in actions) {

            for ((index, action) in actions.withIndex()) {

                if (action.getIcon() == null) {

                    Log.i(TAG, "No icon for action $index ${action.title}")

                    actionsToShowCollapsed.remove(index)

                    continue

                }

                val mediaAction = MediaAction(

                        action.getIcon().loadDrawable(packageContext),

                        action.actionIntent,

packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class MediaHierarchyManager @Inject constructor( 
    private var rootOverlay: ViewGroupOverlay? = null

    private lateinit var currentState: MediaState

    private val mediaCarousel

        get() = mediaViewManager.mediaCarousel

        get() = mediaViewManager.mediaFrame

    private var animationStartState: MediaState? = null

    private var statusbarState: Int = statusBarStateController.state

    private var animator = ValueAnimator.ofFloat(0.0f, 1.0f).apply {