commit cb75cd457baeb0bab475564b44d1f8628fad7eca
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 15 02:21:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 15 02:21:04 2020 +0000
tree 43eebedd183995b0acf1b085bf50d7e37b0a056e
parent 63db8bffa9ae990f5bd02ca2ad11920cf13189ab
parent 6db58b0a028b1dd6b284c27e5d3eaa015aec81a4

Merge "Do not use unstable Android styable.CheckBoxPreference" am: e681546f3a am: 6db58b0a02

Change-Id: Ide8abf7a248c5f2ab59c1e4eb3faf17ba1ac6ba1

src/com/android/phone/CallBarringEditPreference.java

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