summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/TextViewWithCircularIndicator.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-07-28 16:56:32 -0700
committerAlan Viverette <alanv@google.com>2014-07-29 12:49:50 -0700
commit60727e07c6ef72e2f494266939c02494a3df28f8 (patch)
tree93c4d59934335d43a9650819ea89e465a26c37d9 /core/java/android/widget/TextViewWithCircularIndicator.java
parentec9c7090f845e0804dab70a73307a747dca1ba3d (diff)
downloadframeworks_base-60727e07c6ef72e2f494266939c02494a3df28f8.zip
frameworks_base-60727e07c6ef72e2f494266939c02494a3df28f8.tar.gz
frameworks_base-60727e07c6ef72e2f494266939c02494a3df28f8.tar.bz2
Clean up TimePicker and DatePicker styling
Removes the time and date picker specific themes and defaults their theme attributes to use the alert dialog theme attribute's value. BUG: 14973897 Change-Id: Id5cc74ea0c1a379fc1ee76b354a1bb5ba329585a
Diffstat (limited to 'core/java/android/widget/TextViewWithCircularIndicator.java')
-rw-r--r--core/java/android/widget/TextViewWithCircularIndicator.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/core/java/android/widget/TextViewWithCircularIndicator.java b/core/java/android/widget/TextViewWithCircularIndicator.java
index 22d770c..43c0843 100644
--- a/core/java/android/widget/TextViewWithCircularIndicator.java
+++ b/core/java/android/widget/TextViewWithCircularIndicator.java
@@ -50,20 +50,18 @@ class TextViewWithCircularIndicator extends TextView {
public TextViewWithCircularIndicator(Context context, AttributeSet attrs,
int defStyleAttr, int defStyleRes) {
-
super(context, attrs);
- Resources res = context.getResources();
+
// Use Theme attributes if possible
final TypedArray a = mContext.obtainStyledAttributes(attrs,
R.styleable.DatePicker, defStyleAttr, defStyleRes);
-
- final int resId = a.getResourceId(
- R.styleable.DatePicker_dateSelectorYearListItemTextAppearance, -1);
+ final int resId = a.getResourceId(R.styleable.DatePicker_yearListItemTextAppearance, -1);
if (resId != -1) {
setTextAppearance(context, resId);
}
+ final Resources res = context.getResources();
mItemIsSelectedText = res.getString(R.string.item_is_selected);
a.recycle();