commit 762a29b3aec18ec9298949c14345d27071138297
author Meng Wang <mewan@google.com> Wed May 06 22:38:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 06 22:38:40 2020 +0000
tree ac0115d71d6ced708fe3d4880c25692aa90df84d
parent b26d7338305e5a72c8f1775ab6f3e34a3d222584
parent c15b81eaad14e37e2f48c9e421245a66eeb5e50e

Merge "Revert "Do not use unstable Android styable.CheckBoxPreference"" am: c15b81eaad

Change-Id: I4d31232ee3ca2f57f581715be76fa3334a3f0560

src/com/android/phone/CallBarringEditPreference.java

diff --git a/src/com/android/phone/CallBarringEditPreference.java b/src/com/android/phone/CallBarringEditPreference.java
index 5d83de1..b8e3250 100644
--- a/src/com/android/phone/CallBarringEditPreference.java
+++ b/src/com/android/phone/CallBarringEditPreference.java
@@ -74,9 +74,9 @@
         super(context, attrs);
         // Get the summary settings, use CheckBoxPreference as the standard.
         TypedArray typedArray = context.obtainStyledAttributes(attrs,
-                R.styleable.CheckBoxPreference, 0, 0);
-        mSummaryOn = typedArray.getString(R.styleable.CheckBoxPreference_summaryOn);
-        mSummaryOff = typedArray.getString(R.styleable.CheckBoxPreference_summaryOff);
+                android.R.styleable.CheckBoxPreference, 0, 0);
+        mSummaryOn = typedArray.getString(android.R.styleable.CheckBoxPreference_summaryOn);
+        mSummaryOff = typedArray.getString(android.R.styleable.CheckBoxPreference_summaryOff);
         mDisableText = context.getText(R.string.disable);
         mEnableText = context.getText(R.string.enable);
         typedArray.recycle();