diff options
author | John Patterson <jdp@google.com> | 2021-01-14 09:49:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-14 09:49:41 +0000 |
commit | 238013edb2187750d9e70f2d7a4f55c01a742498 (patch) | |
tree | f6d612f8ff911b42b55ad4995e38b6ecf2ce2358 /src/com/android/car/calendar/CarCalendarActivity.java | |
parent | 31f1816dfac8542d63205fe9f3fc4377e6dbe3be (diff) | |
parent | 6a802e58054c7c9da8245ba291c4d773b090543a (diff) | |
download | Calendar-238013edb2187750d9e70f2d7a4f55c01a742498.tar.gz |
Unbundle the Car Calendar App. am: 6a802e5805
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Calendar/+/13323725
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73b352c1905ef125aa88fc1214503d24e2b9cc41
Diffstat (limited to 'src/com/android/car/calendar/CarCalendarActivity.java')
-rw-r--r-- | src/com/android/car/calendar/CarCalendarActivity.java | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/com/android/car/calendar/CarCalendarActivity.java b/src/com/android/car/calendar/CarCalendarActivity.java index 97e2031..945482a 100644 --- a/src/com/android/car/calendar/CarCalendarActivity.java +++ b/src/com/android/car/calendar/CarCalendarActivity.java @@ -20,6 +20,7 @@ import android.content.ContentResolver; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.StrictMode; +import android.telephony.TelephonyManager; import android.util.Log; import androidx.annotation.NonNull; @@ -58,7 +59,10 @@ public class CarCalendarActivity extends FragmentActivity { // Tests can set fake dependencies before onCreate. if (mDependencies == null) { mDependencies = new Dependencies( - Locale.getDefault(), Clock.systemDefaultZone(), getContentResolver()); + Locale.getDefault(), + Clock.systemDefaultZone(), + getContentResolver(), + getSystemService(TelephonyManager.class)); } CarCalendarViewModel carCalendarViewModel = @@ -67,6 +71,7 @@ public class CarCalendarActivity extends FragmentActivity { new CarCalendarViewModelFactory( mDependencies.mResolver, mDependencies.mLocale, + mDependencies.mTelephonyManager, mDependencies.mClock)) .get(CarCalendarViewModel.class); @@ -142,12 +147,18 @@ public class CarCalendarActivity extends FragmentActivity { private static class CarCalendarViewModelFactory implements ViewModelProvider.Factory { private final ContentResolver mResolver; + private final TelephonyManager mTelephonyManager; private final Locale mLocale; private final Clock mClock; - CarCalendarViewModelFactory(ContentResolver resolver, Locale locale, Clock clock) { + CarCalendarViewModelFactory( + ContentResolver resolver, + Locale locale, + TelephonyManager telephonyManager, + Clock clock) { mResolver = resolver; mLocale = locale; + mTelephonyManager = telephonyManager; mClock = clock; } @@ -155,7 +166,7 @@ public class CarCalendarActivity extends FragmentActivity { @NonNull @Override public <T extends ViewModel> T create(@NonNull Class<T> aClass) { - return (T) new CarCalendarViewModel(mResolver, mLocale, mClock); + return (T) new CarCalendarViewModel(mResolver, mLocale, mTelephonyManager, mClock); } } @@ -163,11 +174,17 @@ public class CarCalendarActivity extends FragmentActivity { private final Locale mLocale; private final Clock mClock; private final ContentResolver mResolver; + private final TelephonyManager mTelephonyManager; - Dependencies(Locale locale, Clock clock, ContentResolver resolver) { + Dependencies( + Locale locale, + Clock clock, + ContentResolver resolver, + TelephonyManager telephonyManager) { mLocale = locale; mClock = clock; mResolver = resolver; + mTelephonyManager = telephonyManager; } } } |