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

Commit 651fc286 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Home Controls: Consolidate flags for QS media player/NPV"

parents e5c88a80 5a19cb61

packages/SystemUI/res/layout/home_controls.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/home_controls_layout"

    android:layout_width="match_parent"

    android:layout_height="125dp"

    android:layout_height="wrap_content"

    android:layout_gravity="@integer/notification_panel_layout_gravity"

    android:visibility="gone"

    android:padding="8dp"

packages/SystemUI/res/layout/status_bar_expanded_plugin_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:id="@+id/plugin_frame"

    android:theme="@style/qs_theme"

    android:layout_width="@dimen/qs_panel_width"

    android:layout_height="105dp"

    android:layout_height="wrap_content"

    android:layout_gravity="center_horizontal"

    android:layout_marginTop="@dimen/notification_side_paddings"

    android:layout_marginLeft="@dimen/notification_side_paddings"

packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java

+2 −4
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 


package com.android.systemui.qs;



import android.provider.Settings;

import android.util.Log;

import android.view.View;

import android.view.View.OnAttachStateChangeListener;
@@ -31,6 +30,7 @@ import com.android.systemui.qs.TouchAnimator.Builder; 
import com.android.systemui.qs.TouchAnimator.Listener;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.tuner.TunerService.Tunable;

import com.android.systemui.util.Utils;



import java.util.ArrayList;

import java.util.Collection;
@@ -270,9 +270,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
        }





        int flag = Settings.System.getInt(mQsPanel.getContext().getContentResolver(),

                "qs_media_player", 0);

        if (flag == 1) {

        if (Utils.useQsMediaPlayer(mQsPanel.getContext())) {

            View qsMediaView = mQsPanel.getMediaPanel();

            View qqsMediaView = mQuickQsPanel.getMediaPlayer().getView();

            translationXBuilder.addFloat(qsMediaView, "alpha", 0, 1);

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

+3 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.qs; 


import static com.android.systemui.qs.tileimpl.QSTileImpl.getColorForState;

import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEXT;

import static com.android.systemui.util.Utils.useQsMediaPlayer;



import android.annotation.Nullable;

import android.content.ComponentName;
@@ -150,8 +151,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne 
        addDivider();



        // Add media carousel

        int flag = Settings.System.getInt(context.getContentResolver(), "qs_media_player", 0);

        if (flag == 1) {

        if (useQsMediaPlayer(context)) {

            HorizontalScrollView mediaScrollView = new HorizontalScrollView(mContext);

            mediaScrollView.setHorizontalScrollBarEnabled(false);

            int playerHeight = (int) getResources().getDimension(R.dimen.qs_media_height);
@@ -201,8 +201,7 @@ public class QSPanel extends LinearLayout implements Tunable, Callback, Brightne 
     */

    public void addMediaSession(MediaSession.Token token, Icon icon, int iconColor, int bgColor,

            View actionsContainer, StatusBarNotification notif) {

        int flag = Settings.System.getInt(mContext.getContentResolver(), "qs_media_player", 0);

        if (flag != 1) {

        if (!useQsMediaPlayer(mContext)) {

            // Shouldn't happen, but just in case

            Log.e(TAG, "Tried to add media session without player!");

            return;

packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java

+2 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import static com.android.systemui.util.InjectionInflationController.VIEW_CONTEX 
import android.content.Context;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.provider.Settings;

import android.util.AttributeSet;

import android.view.Gravity;

import android.view.View;
@@ -36,6 +35,7 @@ import com.android.systemui.plugins.qs.QSTile.State; 
import com.android.systemui.qs.customize.QSCustomizer;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.tuner.TunerService.Tunable;

import com.android.systemui.util.Utils;



import java.util.ArrayList;

import java.util.Collection;
@@ -72,8 +72,7 @@ public class QuickQSPanel extends QSPanel { 
            removeView((View) mTileLayout);

        }



        int flag = Settings.System.getInt(context.getContentResolver(), "qs_media_player", 0);

        if (flag == 1) {

        if (Utils.useQsMediaPlayer(context)) {

            LinearLayout mHorizontalLinearLayout = new LinearLayout(mContext);

            mHorizontalLinearLayout.setOrientation(LinearLayout.HORIZONTAL);

            mHorizontalLinearLayout.setClipChildren(false);