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

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

Merge "QS Tweaks" into oc-dr1-dev

parents 31816f74 3c3b650a

packages/SystemUI/res/layout/qs_detail.xml

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
        android:background="@color/qs_detail_progress_track"

        android:src="@drawable/indeterminate_anim"

        android:scaleType="fitXY"

        android:translationY="16dp"

        />



    <com.android.systemui.qs.NonInterceptingScrollView

packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java

+5 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { 
    @Override

    protected void handleClick() {

        // Secondary clicks are header clicks, just toggle.

        final boolean isEnabled = (Boolean)mState.value;

        final boolean isEnabled = mState.value;

        mController.setBluetoothEnabled(!isEnabled);

    }
@@ -100,6 +100,9 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { 
            return;

        }

        showDetail(true);

        if (!mState.value) {

            mController.setBluetoothEnabled(true);

        }

    }



    @Override
@@ -179,6 +182,7 @@ public class BluetoothTile extends QSTileImpl<BooleanState> { 
            refreshState();

            if (isShowingDetail()) {

                mDetailAdapter.updateItems();

                fireToggleStateChanged(mDetailAdapter.getToggleState());

            }

        }

packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java

+18 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.provider.Settings.Global; 
import android.service.notification.ZenModeConfig;

import android.service.notification.ZenModeConfig.ZenRule;

import android.service.quicksettings.Tile;

import android.util.Log;

import android.util.Slog;

import android.view.LayoutInflater;

import android.view.View;
@@ -54,6 +55,7 @@ import com.android.systemui.plugins.qs.QSTile.BooleanState; 
import com.android.systemui.qs.QSHost;

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

import com.android.systemui.statusbar.policy.ZenModeController;

import com.android.systemui.statusbar.policy.ZenModeController.Callback;

import com.android.systemui.volume.ZenModePanel;



/** Quick settings tile: Do not disturb **/
@@ -147,8 +149,23 @@ public class DndTile extends QSTileImpl<BooleanState> { 
                    Toast.LENGTH_LONG).show();

            return;

        }

        if (!mState.value) {

            // Because of the complexity of the zen panel, it needs to be shown after

            // we turn on zen below.

            mController.addCallback(new ZenModeController.Callback() {

                @Override

                public void onZenChanged(int zen) {

                    mController.removeCallback(this);

                    showDetail(true);

                }

            });

            int zen = Prefs.getInt(mContext, Prefs.Key.DND_FAVORITE_ZEN,

                    Global.ZEN_MODE_ALARMS);

            mController.setZen(zen, null, TAG);

        } else {

            showDetail(true);

        }

    }



    @Override

    public CharSequence getTileLabel() {

packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java

+3 −0
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ public class WifiTile extends QSTileImpl<SignalState> { 
            return;

        }

        showDetail(true);

        if (!mState.value) {

            mController.setWifiEnabled(true);

        }

    }



    @Override