Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2057d90 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge changes I09e8c4eb,I91a0e05f into honeycomb 

* changes:
  Use a DateFormat that fits.
  Update the network info when the configuration changes.
parents b2abd8c4 0c953f68

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

+5 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.text.format.DateFormat;

import android.util.AttributeSet;

import android.util.Slog;

import android.widget.TextView;
@@ -27,7 +28,6 @@ import android.view.MotionEvent; 
import android.view.View;

import android.view.ViewParent;



import java.text.DateFormat;

import java.util.Date;



public final class DateView extends TextView {
@@ -86,8 +86,11 @@ public final class DateView extends TextView { 
    }



    private final void updateClock() {

        final Context context = getContext();

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

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

+3 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ public class NetworkController extends BroadcastReceiver { 
        filter.addAction(Telephony.Intents.SPN_STRINGS_UPDATED_ACTION);

        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

        filter.addAction(ConnectivityManager.INET_CONDITION_ACTION);

        filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);

        context.registerReceiver(this, filter);



        // yuck
@@ -197,6 +198,8 @@ public class NetworkController extends BroadcastReceiver { 
                 action.equals(ConnectivityManager.INET_CONDITION_ACTION)) {

            updateConnectivity(intent);

            refreshViews();

        } else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {

            refreshViews();

        }

    }