summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael W <baddaemon87@gmail.com>2020-07-13 14:38:05 +0200
committerMichael Bestas <mkbestas@lineageos.org>2020-12-08 19:39:12 +0200
commit5c4625eacd47fca98e730318c1b4bf02b793327b (patch)
treee604c371463920d93a2afd796a0cfcdba73ba0b4
parent9ef3d79e043ad33934616b710eb201f032c539b8 (diff)
DeskClock: Fix FAB not being shown everytime
* The getTimer() method returns null when we call getFabTargetVisibility() before the onCreateView method gets called, resulting in the FAB not being shown * A video how to reproduce the issue can be found on the bug report linked below * Fix: Always return the first timer (if one exists) so we can properly decide if the FAB needs to be shown Fixes: https://gitlab.com/LineageOS/issues/android/-/issues/2250 Change-Id: Id16686c729ee41d14c890827dc441e81511c8405
-rw-r--r--src/com/android/deskclock/timer/TimerFragment.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/deskclock/timer/TimerFragment.java b/src/com/android/deskclock/timer/TimerFragment.java
index 0b2a49cec..e194891ef 100644
--- a/src/com/android/deskclock/timer/TimerFragment.java
+++ b/src/com/android/deskclock/timer/TimerFragment.java
@@ -687,6 +687,11 @@ public final class TimerFragment extends DeskClockFragment {
}
private Timer getTimer() {
+ if (mAdapter == null) {
+ TimerPagerAdapter adapter = new TimerPagerAdapter(getFragmentManager());
+ return adapter.getCount() == 0 ? null : adapter.getTimer(0);
+ }
+
if (mViewPager == null) {
return null;
}