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

Commit 4ef69575 authored by Michael Mikhail's avatar Michael Mikhail Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b241485754-master-merge" 

* changes:
  Format media control files
  Organize media control classes
parents c00f6a96 f69de21d

packages/SystemUI/ktfmt_includes.txt

+0 −57
Original line number Diff line number Diff line
@@ -189,45 +189,8 @@ 
-packages/SystemUI/src/com/android/systemui/log/LogcatEchoTracker.kt

-packages/SystemUI/src/com/android/systemui/log/LogcatEchoTrackerDebug.kt

-packages/SystemUI/src/com/android/systemui/log/LogcatEchoTrackerProd.kt

-packages/SystemUI/src/com/android/systemui/media/AnimationBindHandler.kt

-packages/SystemUI/src/com/android/systemui/media/ColorSchemeTransition.kt

-packages/SystemUI/src/com/android/systemui/media/GutsViewHolder.kt

-packages/SystemUI/src/com/android/systemui/media/IlluminationDrawable.kt

-packages/SystemUI/src/com/android/systemui/media/KeyguardMediaController.kt

-packages/SystemUI/src/com/android/systemui/media/LightSourceDrawable.kt

-packages/SystemUI/src/com/android/systemui/media/LocalMediaManagerFactory.kt

-packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt

-packages/SystemUI/src/com/android/systemui/media/MediaCarouselControllerLogger.kt

-packages/SystemUI/src/com/android/systemui/media/MediaCarouselScrollHandler.kt

-packages/SystemUI/src/com/android/systemui/media/MediaData.kt

-packages/SystemUI/src/com/android/systemui/media/MediaDataCombineLatest.kt

-packages/SystemUI/src/com/android/systemui/media/MediaDataFilter.kt

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

-packages/SystemUI/src/com/android/systemui/media/MediaDeviceManager.kt

-packages/SystemUI/src/com/android/systemui/media/MediaFeatureFlag.kt

-packages/SystemUI/src/com/android/systemui/media/MediaFlags.kt

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

-packages/SystemUI/src/com/android/systemui/media/MediaHost.kt

-packages/SystemUI/src/com/android/systemui/media/MediaHostStatesManager.kt

-packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt

-packages/SystemUI/src/com/android/systemui/media/MediaProjectionCaptureTarget.kt

-packages/SystemUI/src/com/android/systemui/media/MediaResumeListener.kt

-packages/SystemUI/src/com/android/systemui/media/MediaScrollView.kt

-packages/SystemUI/src/com/android/systemui/media/MediaSessionBasedFilter.kt

-packages/SystemUI/src/com/android/systemui/media/MediaTimeoutListener.kt

-packages/SystemUI/src/com/android/systemui/media/MediaTimeoutLogger.kt

-packages/SystemUI/src/com/android/systemui/media/MediaUiEventLogger.kt

-packages/SystemUI/src/com/android/systemui/media/MediaViewController.kt

-packages/SystemUI/src/com/android/systemui/media/MediaViewHolder.kt

-packages/SystemUI/src/com/android/systemui/media/MediaViewLogger.kt

-packages/SystemUI/src/com/android/systemui/media/MetadataAnimationHandler.kt

-packages/SystemUI/src/com/android/systemui/media/RecommendationViewHolder.kt

-packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowserLogger.kt

-packages/SystemUI/src/com/android/systemui/media/SeekBarObserver.kt

-packages/SystemUI/src/com/android/systemui/media/SeekBarViewModel.kt

-packages/SystemUI/src/com/android/systemui/media/SmartspaceMediaData.kt

-packages/SystemUI/src/com/android/systemui/media/SmartspaceMediaDataProvider.kt

-packages/SystemUI/src/com/android/systemui/media/SquigglyProgress.kt

-packages/SystemUI/src/com/android/systemui/media/dagger/MediaProjectionModule.kt

-packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialogFactory.kt

-packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogFactory.kt
@@ -653,26 +616,6 @@ 
-packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/lifecycle/InstantTaskExecutorRule.kt

-packages/SystemUI/tests/src/com/android/systemui/log/LogBufferTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/AnimationBindHandlerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/ColorSchemeTransitionTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/KeyguardMediaControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaCarouselControllerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaControlPanelTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaDataFilterTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaDataManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaDeviceManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaHierarchyManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaPlayerDataTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaResumeListenerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaSessionBasedFilterTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaTestUtils.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MediaTimeoutListenerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/MetadataAnimationHandlerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/ResumeMediaBrowserTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/SeekBarObserverTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/SeekBarViewModelTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/SmartspaceMediaDataTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/SquigglyProgressTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/muteawait/MediaMuteAwaitConnectionManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/nearby/NearbyMediaDevicesManagerTest.kt

-packages/SystemUI/tests/src/com/android/systemui/media/taptotransfer/MediaTttCommandLineHelperTest.kt

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"