Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop using DATE_FORMAT from settings."

Browse Source
This commit is contained in:
Narayan Kamath
2014-11-24 16:14:32 +00:00
committed by Gerrit Code Review
parent 1d84709cf4 775eca105c
commit 32ed090f5a
1 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/widget/DateTimeView.java
View File

@@ -149,7 +149,7 @@ public class DateTimeView extends TextView {
format = getTimeFormat(); format = getTimeFormat();
break; break;
case SHOW_MONTH_DAY_YEAR: case SHOW_MONTH_DAY_YEAR:
format = getDateFormat(); format = DateFormat.getDateInstance(DateFormat.SHORT);
break; break;
default: default:
throw new RuntimeException("unknown display value: " + display); throw new RuntimeException("unknown display value: " + display);
@@ -189,21 +189,6 @@ public class DateTimeView extends TextView {
return android.text.format.DateFormat.getTimeFormat(getContext()); return android.text.format.DateFormat.getTimeFormat(getContext());
} }
private DateFormat getDateFormat() {
String format = Settings.System.getString(getContext().getContentResolver(),
Settings.System.DATE_FORMAT);
if (format == null || "".equals(format)) {
return DateFormat.getDateInstance(DateFormat.SHORT);
} else {
try {
return new SimpleDateFormat(format);
} catch (IllegalArgumentException e) {
// If we tried to use a bad format string, fall back to a default.
return DateFormat.getDateInstance(DateFormat.SHORT);
}
}
}
private void registerReceivers() { private void registerReceivers() {
Context context = getContext(); Context context = getContext();
@@ -213,15 +198,11 @@ public class DateTimeView extends TextView {
filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED); filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
filter.addAction(Intent.ACTION_TIMEZONE_CHANGED); filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
context.registerReceiver(mBroadcastReceiver, filter); context.registerReceiver(mBroadcastReceiver, filter);
Uri uri = Settings.System.getUriFor(Settings.System.DATE_FORMAT);
context.getContentResolver().registerContentObserver(uri, true, mContentObserver);
} }
private void unregisterReceivers() { private void unregisterReceivers() {
Context context = getContext(); Context context = getContext();
context.unregisterReceiver(mBroadcastReceiver); context.unregisterReceiver(mBroadcastReceiver);
context.getContentResolver().unregisterContentObserver(mContentObserver);
} }
private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@@ -241,12 +222,4 @@ public class DateTimeView extends TextView {
update(); update();
} }
}; };
private ContentObserver mContentObserver = new ContentObserver(new Handler()) {
@Override
public void onChange(boolean selfChange) {
mLastFormat = null;
update();
}
};
} }