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

Commit fc817591 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Organize media control classes" into tm-qpr-dev am: 6e74a441 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20229467



Change-Id: I2b21e8be978e5042b8a8b31a8790a66203a8c48f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2df43628 6e74a441

packages/SystemUI/res-keyguard/drawable/media_squiggly_progress.xml→packages/SystemUI/res/drawable/media_squiggly_progress.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.android.systemui.media.SquigglyProgress />
 
 No newline at end of file
 
<com.android.systemui.media.controls.ui.SquigglyProgress />
 
 No newline at end of file

packages/SystemUI/res/drawable/qs_media_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

<com.android.systemui.media.IlluminationDrawable

<com.android.systemui.media.controls.ui.IlluminationDrawable

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

    systemui:highlight="15"

    systemui:cornerRadius="@dimen/notification_corner_radius" />
 
 No newline at end of file

packages/SystemUI/res/drawable/qs_media_light_source.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<com.android.systemui.media.LightSourceDrawable

<com.android.systemui.media.controls.ui.LightSourceDrawable

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

    systemui:rippleMinSize="25dp"

    systemui:rippleMaxSize="135dp" />
 
 No newline at end of file

packages/SystemUI/res/layout/media_carousel.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    android:clipToPadding="false"

    android:forceHasOverlappingRendering="false"

    android:theme="@style/MediaPlayer">

    <com.android.systemui.media.MediaScrollView

    <com.android.systemui.media.controls.ui.MediaScrollView

        android:id="@+id/media_carousel_scroller"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -42,7 +42,7 @@ 
            >

            <!-- QSMediaPlayers will be added here dynamically -->

        </LinearLayout>

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

    </com.android.systemui.media.controls.ui.MediaScrollView>

    <com.android.systemui.qs.PageIndicator

        android:id="@+id/media_page_indicator"

        android:layout_width="wrap_content"

packages/SystemUI/src/com/android/systemui/bluetooth/BroadcastDialog.java

+1 −5
Original line number Diff line number Diff line
@@ -17,15 +17,11 @@ 
package com.android.systemui.bluetooth;



import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.os.Bundle;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Button;

import android.widget.TextView;
@@ -33,7 +29,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;

import com.android.systemui.R;

import com.android.systemui.media.MediaDataUtils;

import com.android.systemui.media.controls.util.MediaDataUtils;

import com.android.systemui.media.dialog.MediaOutputDialogFactory;

import com.android.systemui.statusbar.phone.SystemUIDialog;