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

Commit 483f12a8 authored by Michael W's avatar Michael W
Browse files

DeskClock: Cleanup: Fix various warnings and tips 

* Possible NPEs, non-constant resources
* Line lengths

Change-Id: I089c0978accf35a435691621629347a5688ba45d
parent 5e790f7c

src/com/android/alarmclock/DigitalAppWidgetProvider.java

+3 −0
Original line number Diff line number Diff line
@@ -381,6 +381,9 @@ public class DigitalAppWidgetProvider extends AppWidgetProvider { 
            zones.add(city.getTimeZone());

        }

        final Date nextDay = Utils.getNextDay(new Date(), zones);

        if (nextDay == null) {

            return;

        }



        // Schedule the next day-change callback; at least one city is displayed.

        final PendingIntent pi = PendingIntent.getBroadcast(context, 0, DAY_CHANGE_INTENT,

src/com/android/alarmclock/WidgetUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public final class WidgetUtils { 
            ratio *= .83f;



            if (cityCount > 0) {

                return (ratio > 1f) ? 1f : ratio;

                return Math.min(ratio, 1f);

            }



            ratio = Math.min(ratio, 1.6f);

src/com/android/deskclock/AlarmClockFragment.java

+9 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.deskclock;



import android.app.Activity;

import android.content.Context;

import android.content.Intent;

import android.database.Cursor;
@@ -158,7 +159,7 @@ public final class AlarmClockFragment extends DeskClockFragment implements 
                        final RecyclerView.ViewHolder viewHolder =

                                mRecyclerView.findViewHolderForItemId(mExpandedAlarmId);

                        if (viewHolder != null) {

                            smoothScrollTo(viewHolder.getAdapterPosition());

                            smoothScrollTo(viewHolder.getBindingAdapterPosition());

                        }

                    }

                } else if (mExpandedAlarmId == holder.itemId) {
@@ -201,7 +202,11 @@ public final class AlarmClockFragment extends DeskClockFragment implements 
        UiDataModel.getUiDataModel().addMidnightCallback(mMidnightUpdater);



        // Check if another app asked us to create a blank new alarm.

        final Intent intent = getActivity().getIntent();

        final Activity activity = getActivity();

        if (activity == null) {

            return;

        }

        final Intent intent = activity.getIntent();

        if (intent == null) {

            return;

        }
@@ -306,7 +311,8 @@ public final class AlarmClockFragment extends DeskClockFragment implements 
            return;

        }



        if (mRecyclerView.getItemAnimator().isRunning()) {

        if (mRecyclerView.getItemAnimator() != null &&

                mRecyclerView.getItemAnimator().isRunning()) {

            // RecyclerView is currently animating -> defer update.

            mRecyclerView.getItemAnimator().isRunning(() -> setAdapterItems(items, updateToken));

        } else if (mRecyclerView.isComputingLayout()) {

src/com/android/deskclock/AlarmRecyclerView.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class AlarmRecyclerView extends RecyclerView { 
            @Override

            public boolean onInterceptTouchEvent(@NonNull RecyclerView rv, @NonNull MotionEvent e) {

                // Disable scrolling/user action to prevent choppy animations.

                return rv.getItemAnimator().isRunning();

                return rv.getItemAnimator() != null && rv.getItemAnimator().isRunning();

            }

        });

    }

src/com/android/deskclock/AlarmSelectionActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.widget.ListView; 
import com.android.deskclock.provider.Alarm;

import com.android.deskclock.widget.selector.AlarmSelectionAdapter;



import java.lang.ref.WeakReference;

import java.util.ArrayList;

import java.util.List;

import java.util.Locale;
@@ -92,12 +93,12 @@ public class AlarmSelectionActivity extends ListActivity { 
    private static class ProcessAlarmActionAsync extends AsyncTask<Void, Void, Void> {



        private final Alarm mAlarm;

        private final Activity mActivity;

        private final WeakReference<Activity> mActivity;

        private final int mAction;



        public ProcessAlarmActionAsync(Alarm alarm, Activity activity, int action) {

            mAlarm = alarm;

            mActivity = activity;

            mActivity = new WeakReference<>(activity);

            mAction = action;

        }
@@ -105,7 +106,7 @@ public class AlarmSelectionActivity extends ListActivity { 
        protected Void doInBackground(Void... parameters) {

            switch (mAction) {

                case ACTION_DISMISS:

                    HandleApiCalls.dismissAlarm(mAlarm, mActivity);

                    HandleApiCalls.dismissAlarm(mAlarm, mActivity.get());

                    break;

                case ACTION_INVALID:

                    LogUtils.i("Invalid action");