diff options
| author | John Spurlock <jspurlock@google.com> | 2015-05-18 15:19:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-18 15:19:20 +0000 |
| commit | 59c15e30afbce7efbf410e5e57b1fe1be5770e3b (patch) | |
| tree | 80e093927ca084a4244ffac95c7202797331bbda | |
| parent | 128b3c86c6f664b5a14c40d3d90c2f8172ea11b6 (diff) | |
| parent | 814ee6ab8bbf4a3f96dc76091d6bce67394b5b70 (diff) | |
| download | frameworks_base-59c15e30afbce7efbf410e5e57b1fe1be5770e3b.zip frameworks_base-59c15e30afbce7efbf410e5e57b1fe1be5770e3b.tar.gz frameworks_base-59c15e30afbce7efbf410e5e57b1fe1be5770e3b.tar.bz2 | |
Merge "DND: Fix locale and rtl issues in QS detail panel." into mnc-dev
3 files changed, 10 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml index 2160ca3..731d4c1 100644 --- a/packages/SystemUI/res/layout/zen_mode_panel.xml +++ b/packages/SystemUI/res/layout/zen_mode_panel.xml @@ -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" /> diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java index 3b217df..72bb136 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java @@ -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; diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java index 8dfa9b0..ec24d75 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java @@ -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() { |