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

Commit 59c15e30 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "DND: Fix locale and rtl issues in QS detail panel." into mnc-dev

parents 128b3c86 814ee6ab

packages/SystemUI/res/layout/zen_mode_panel.xml

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginTop="12dp"

            android:layout_marginStart="24dp"

            android:textDirection="locale"

            android:lineSpacingMultiplier="1.20029"

            android:layout_toStartOf="@id/zen_introduction_confirm"

            android:textAppearance="@style/TextAppearance.QS.Introduction" />

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

+1 −3
Original line number Diff line number Diff line
@@ -24,23 +24,21 @@ import android.graphics.drawable.Drawable; 
import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.text.TextUtils;

import android.util.Log;

import android.util.SparseArray;

import android.view.View;

import android.view.ViewGroup;



import com.android.internal.logging.MetricsLogger;

import com.android.systemui.qs.QSTile.State;

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

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

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

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

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

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

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

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

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

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

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



import java.util.Collection;

packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java

+8 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.SharedPreferences;

import android.content.SharedPreferences.OnSharedPreferenceChangeListener;

import android.content.res.Configuration;

import android.net.Uri;

import android.os.AsyncTask;

import android.os.Handler;
@@ -175,7 +176,14 @@ public class ZenModePanel extends LinearLayout { 
        });



        mZenConditions = (LinearLayout) findViewById(R.id.zen_conditions);

    }



    @Override

    protected void onConfigurationChanged(Configuration newConfig) {

        super.onConfigurationChanged(newConfig);

        if (mZenButtons != null) {

            mZenButtons.updateLocale();

        }

    }



    private void confirmZenIntroduction() {