commit 2a613022dbb278f0f7dd94cf49885cde9d36100c
author Yorke Lee <yorkelee@google.com> Wed Jul 01 14:28:13 2015 -0700
committer Yorke Lee <yorkelee@google.com> Wed Jul 01 15:56:01 2015 -0700
tree 9cf82f7fff1e5431bb92dadfdbc8e3bfb3be3470
parent 82d30284d32d2e563661ad0a1465c1b9bf501a9f

Restore Dialer content after permissions granted

First pass at making Dialer display the call log, favorites,
all contacts, and contact search after permissions are granted
withut having to restart the app.

Update cached permission status in onResume for Dialer activities
Update SpeedDialFragment to correctly initialize loader in
onResume if it was null previously because of revoked permission.

Bug: 22205650

Change-Id: I68982e69395bc9c7da84ff3221cd12b8f79005f9

src/com/android/dialer/CallDetailActivity.java

diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index 734e78f..ec92f3f 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -47,6 +47,7 @@
 
 import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
+import com.android.contacts.common.util.PermissionsUtil;
 import com.android.contacts.common.GeoUtil;
 import com.android.contacts.common.CallUtil;
 import com.android.dialer.calllog.CallDetailHistoryAdapter;
@@ -267,6 +268,7 @@
     @Override
     public void onResume() {
         super.onResume();
+        PermissionsUtil.updateCachedPermissions(this);
         getCallDetails();
     }
 

src/com/android/dialer/DialtactsActivity.java

diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java
index b8a1d4d..d1a6872 100644
--- a/src/com/android/dialer/DialtactsActivity.java
+++ b/src/com/android/dialer/DialtactsActivity.java
@@ -511,6 +511,8 @@
     protected void onResume() {
         Trace.beginSection(TAG + " onResume");
         super.onResume();
+
+        PermissionsUtil.updateCachedPermissions(this);
         mStateSaved = false;
         if (mFirstLaunch) {
             displayFragment(getIntent());

src/com/android/dialer/calllog/CallLogActivity.java

diff --git a/src/com/android/dialer/calllog/CallLogActivity.java b/src/com/android/dialer/calllog/CallLogActivity.java
index d5444de..0f2f838 100644
--- a/src/com/android/dialer/calllog/CallLogActivity.java
+++ b/src/com/android/dialer/calllog/CallLogActivity.java
@@ -35,6 +35,7 @@
 
 import com.android.contacts.common.interactions.TouchPointManager;
 import com.android.contacts.common.list.ViewPagerTabs;
+import com.android.contacts.common.util.PermissionsUtil;
 import com.android.contacts.commonbind.analytics.AnalyticsUtil;
 import com.android.dialer.DialtactsActivity;
 import com.android.dialer.R;
@@ -150,6 +151,7 @@
     protected void onResume() {
         mIsResumed = true;
         super.onResume();
+        PermissionsUtil.updateCachedPermissions(this);
         sendScreenViewForChildFragment(mViewPager.getCurrentItem());
     }
 

src/com/android/dialer/list/SpeedDialFragment.java

diff --git a/src/com/android/dialer/list/SpeedDialFragment.java b/src/com/android/dialer/list/SpeedDialFragment.java
index 541cdf6..bf95758 100644
--- a/src/com/android/dialer/list/SpeedDialFragment.java
+++ b/src/com/android/dialer/list/SpeedDialFragment.java
@@ -194,7 +194,12 @@
         super.onResume();
 
         if (PermissionsUtil.hasContactsPermissions(getActivity())) {
-            getLoaderManager().getLoader(LOADER_ID_CONTACT_TILE).forceLoad();
+            if (getLoaderManager().getLoader(LOADER_ID_CONTACT_TILE) == null) {
+                getLoaderManager().initLoader(LOADER_ID_CONTACT_TILE, null,
+                        mContactTileLoaderListener);
+            } else {
+                getLoaderManager().getLoader(LOADER_ID_CONTACT_TILE).forceLoad();
+            }
         }
         Trace.endSection();
     }