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

am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev

Browse Source 
* commit '154e2d7d2c6c5a316b5471d56c86174dd9ca5e86':
  Flush the clock format when the locale changes.
This commit is contained in:
Daniel Sandler
2012-11-29 11:23:10 -08:00
committed by Android Git Automerger
parent 4b77660b38 154e2d7d2c
commit a8a63dd7d9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java
View File

@@ -40,6 +40,7 @@ import android.widget.TextView;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Locale;
import java.util.TimeZone;
import com.android.internal.R;
@@ -52,6 +53,7 @@ public class Clock extends TextView {
private Calendar mCalendar;
private String mClockFormatString;
private SimpleDateFormat mClockFormat;
private Locale mLocale;
private static final int AM_PM_STYLE_NORMAL = 0;
private static final int AM_PM_STYLE_SMALL = 1;
@@ -117,6 +119,12 @@ public class Clock extends TextView {
if (mClockFormat != null) {
mClockFormat.setTimeZone(mCalendar.getTimeZone());
}
} else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {
final Locale newLocale = getResources().getConfiguration().locale;
if (! newLocale.equals(mLocale)) {
mLocale = newLocale;
mClockFormatString = ""; // force refresh
}
}
updateClock();
}