commit 6db58b0a028b1dd6b284c27e5d3eaa015aec81a4
author Meng Wang <mewan@google.com> Tue Jan 14 18:08:16 2020 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 14 18:08:16 2020 -0800
tree 43eebedd183995b0acf1b085bf50d7e37b0a056e
parent 5da48e01464e6856c5a6c047aa062056e7b999e0
parent e681546f3a8f20ec2972b84e13f4a04542da2669

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

Change-Id: I72da381b02450b60f22abda561c4ae67ca640dc5

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();