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

Commit eff8529d authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Fix crash on widget" into jb-mr1-dev

parents fa43ddfe 2c257636

src/com/android/alarmclock/DigitalAppWidgetProvider.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.res.Resources; 
import android.net.Uri;

import android.os.Bundle;

import android.provider.Settings;

import android.text.TextUtils;

import android.text.format.DateFormat;

import android.util.Log;

import android.util.TypedValue;
@@ -126,7 +127,7 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { 
    private void refreshAlarm(Context c, RemoteViews clock) {

        String nextAlarm = Settings.System.getString(

                c.getContentResolver(), Settings.System.NEXT_ALARM_FORMATTED);

        if (!nextAlarm.isEmpty()) {

        if (!TextUtils.isEmpty(nextAlarm)) {

            clock.setTextViewText(R.id.nextAlarm,

                    c.getString(R.string.control_set_alarm_with_existing, nextAlarm));

            clock.setViewVisibility(R.id.nextAlarm, View.VISIBLE);

src/com/android/alarmclock/DigitalWidgetViewsFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.provider.Settings;

import android.text.TextUtils;

import android.text.format.DateFormat;

import android.util.Log;

import android.util.TypedValue;
@@ -242,7 +243,7 @@ public class DigitalWidgetViewsFactory extends BroadcastReceiver implements Remo 
    private void refreshAlarm(Context c, RemoteViews widget) {

        String nextAlarm = Settings.System.getString(c.getContentResolver(),

                Settings.System.NEXT_ALARM_FORMATTED);

        if (!nextAlarm.isEmpty()) {

        if (!TextUtils.isEmpty(nextAlarm)) {

            widget.setTextViewText(R.id.nextAlarm,

                    c.getString(R.string.control_set_alarm_with_existing, nextAlarm));

            widget.setViewVisibility(R.id.nextAlarm, View.VISIBLE);