commit 5caf3c80fd2659f01ba484db727bb334dccf2357
author Annie Chin <afchin@google.com> Wed Oct 08 00:56:33 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 08 00:56:34 2014 +0000
tree bcb126a0f38e53e5b758dae2491d2f8295ebc5f0
parent b9518bb7384c2ee60dcc1a9d35ab2ac3d61ddbc8
parent 115755eba6ee4f71542d76d166667d2a2cf7f906

Merge "Make timer landscape keyboard bigger." into lmp-mr1-dev

src/com/android/deskclock/AlarmClockFragment.java

diff --git a/src/com/android/deskclock/AlarmClockFragment.java b/src/com/android/deskclock/AlarmClockFragment.java
index 71ce03c..35c1917 100644
--- a/src/com/android/deskclock/AlarmClockFragment.java
+++ b/src/com/android/deskclock/AlarmClockFragment.java
@@ -1443,9 +1443,12 @@
 
     @Override
     public void setFabAppearance(ImageButton fab) {
+        if (!isAdded()) {
+            return;
+        }
         fab.setVisibility(View.VISIBLE);
         fab.setImageResource(R.drawable.ic_fab_plus);
-        fab.setContentDescription(fab.getContext().getString(R.string.button_alarms));
+        fab.setContentDescription(getString(R.string.button_alarms));
     }
 
     @Override

src/com/android/deskclock/ClockFragment.java

diff --git a/src/com/android/deskclock/ClockFragment.java b/src/com/android/deskclock/ClockFragment.java
index ab818cb..6d76cd5 100644
--- a/src/com/android/deskclock/ClockFragment.java
+++ b/src/com/android/deskclock/ClockFragment.java
@@ -278,9 +278,12 @@
 
     @Override
     public void setFabAppearance(ImageButton fab) {
+        if (!isAdded()) {
+            return;
+        }
         fab.setVisibility(View.VISIBLE);
         fab.setImageResource(R.drawable.ic_globe);
-        fab.setContentDescription(fab.getContext().getString(R.string.button_cities));
+        fab.setContentDescription(getString(R.string.button_cities));
     }
 
     @Override

src/com/android/deskclock/stopwatch/StopwatchFragment.java

diff --git a/src/com/android/deskclock/stopwatch/StopwatchFragment.java b/src/com/android/deskclock/stopwatch/StopwatchFragment.java
index 3a23414..26a532f 100644
--- a/src/com/android/deskclock/stopwatch/StopwatchFragment.java
+++ b/src/com/android/deskclock/stopwatch/StopwatchFragment.java
@@ -874,8 +874,11 @@
 
     @Override
     public void setFabAppearance(ImageButton fab) {
-        mFab = fab;
+        if (!isAdded()) {
+            return;
+        }
 
+        mFab = fab;
         if (mState == Stopwatches.STOPWATCH_RUNNING) {
             mFab.setImageResource(R.drawable.ic_fab_pause);
             mFab.setContentDescription(getString(R.string.sw_stop_button));
@@ -888,6 +891,10 @@
 
     @Override
     public void setLeftRightButtonAppearance(ImageButton left, ImageButton right) {
+        if (!isAdded()) {
+            return;
+        }
+
         mLeftButton = left;
         mRightButton = right;
         mLeftButton.setVisibility(mState == Stopwatches.STOPWATCH_RESET ? View.INVISIBLE :

src/com/android/deskclock/timer/TimerFragment.java

diff --git a/src/com/android/deskclock/timer/TimerFragment.java b/src/com/android/deskclock/timer/TimerFragment.java
index 9c13752..7c567b6 100644
--- a/src/com/android/deskclock/timer/TimerFragment.java
+++ b/src/com/android/deskclock/timer/TimerFragment.java
@@ -513,6 +513,10 @@
 
     @Override
     public void setFabAppearance(ImageButton fab) {
+        if (!isAdded()) {
+            return;
+        }
+
         mFab = fab;
         if (mFab != null) {
             if (atTimerTab()) {
@@ -540,6 +544,10 @@
 
     @Override
     public void setLeftRightButtonAppearance(ImageButton left, ImageButton right) {
+        if (!isAdded()) {
+            return;
+        }
+
         mLeftButton = left;
         mRightButton = right;
         if (mLeftButton != null && mRightButton != null && atTimerTab()) {