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

Merge changes I09e8c4eb,I91a0e05f into honeycomb

Browse Source 
* changes:
  Use a DateFormat that fits.
  Update the network info when the configuration changes.
This commit is contained in:
Joe Onorato
2011-01-30 13:18:16 -08:00
committed by Android (Google) Code Review
parent b2abd8c424 0c953f68f5
commit f2057d907b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java
View File

@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.text.format.DateFormat;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Slog; import android.util.Slog;
import android.widget.TextView; import android.widget.TextView;
@@ -27,7 +28,6 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewParent; import android.view.ViewParent;
import java.text.DateFormat;
import java.util.Date; import java.util.Date;
public final class DateView extends TextView { public final class DateView extends TextView {
@@ -86,8 +86,11 @@ public final class DateView extends TextView {
} }
private final void updateClock() { private final void updateClock() {
final Context context = getContext();
Date now = new Date(); Date now = new Date();
setText(DateFormat.getDateInstance(DateFormat.FULL).format(now)); CharSequence dow = DateFormat.format("EEEE", now);
CharSequence date = DateFormat.getMediumDateFormat(getContext()).format(now);
setText(dow + "\n" + date);
} }
private boolean isVisible() { private boolean isVisible() {

3
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
View File

@@ -146,6 +146,7 @@ public class NetworkController extends BroadcastReceiver {
filter.addAction(Telephony.Intents.SPN_STRINGS_UPDATED_ACTION); filter.addAction(Telephony.Intents.SPN_STRINGS_UPDATED_ACTION);
filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
filter.addAction(ConnectivityManager.INET_CONDITION_ACTION); filter.addAction(ConnectivityManager.INET_CONDITION_ACTION);
filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);
context.registerReceiver(this, filter); context.registerReceiver(this, filter);
// yuck // yuck
@@ -197,6 +198,8 @@ public class NetworkController extends BroadcastReceiver {
action.equals(ConnectivityManager.INET_CONDITION_ACTION)) { action.equals(ConnectivityManager.INET_CONDITION_ACTION)) {
updateConnectivity(intent); updateConnectivity(intent);
refreshViews(); refreshViews();
} else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {
refreshViews();
} }
} }