drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6599c128: am 871cb5d5: Merge "Update roots when data cleared, refresh UI." into klp-dev

Browse Source 
* commit '6599c12843fe3c82a5a02978afeb262eeb76f3f4':
  Update roots when data cleared, refresh UI.
This commit is contained in:
Jeff Sharkey
2013-10-23 11:13:06 -07:00
committed by Android Git Automerger
parent 75b96875be 6599c12843
commit 05f92b7c58
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/DocumentsUI/src/com/android/documentsui/DocumentsApplication.java
View File

@ -75,6 +75,7 @@ public class DocumentsApplication extends Application {
packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED); packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
packageFilter.addAction(Intent.ACTION_PACKAGE_CHANGED); packageFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);
packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED); packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
packageFilter.addAction(Intent.ACTION_PACKAGE_DATA_CLEARED);
packageFilter.addDataScheme("package"); packageFilter.addDataScheme("package");
registerReceiver(mCacheReceiver, packageFilter); registerReceiver(mCacheReceiver, packageFilter);

5
packages/DocumentsUI/src/com/android/documentsui/RootsCache.java
View File

@ -60,8 +60,8 @@ import java.util.concurrent.TimeUnit;
public class RootsCache { public class RootsCache {
private static final boolean LOGD = true; private static final boolean LOGD = true;
// TODO: cache roots in local provider to avoid spinning up backends public static final Uri sNotificationUri = Uri.parse(
// TODO: root updates should trigger UI refresh "content://com.android.documentsui.roots/");
private final Context mContext; private final Context mContext;
private final ContentObserver mObserver; private final ContentObserver mObserver;
@ -201,6 +201,7 @@ public class RootsCache {
mStoppedAuthorities = mTaskStoppedAuthorities; mStoppedAuthorities = mTaskStoppedAuthorities;
} }
mFirstLoad.countDown(); mFirstLoad.countDown();
resolver.notifyChange(sNotificationUri, null, false);
return null; return null;
} }

7
packages/DocumentsUI/src/com/android/documentsui/RootsLoader.java
View File

@ -25,6 +25,8 @@ import com.android.documentsui.model.RootInfo;
import java.util.Collection; import java.util.Collection;
public class RootsLoader extends AsyncTaskLoader<Collection<RootInfo>> { public class RootsLoader extends AsyncTaskLoader<Collection<RootInfo>> {
private final ForceLoadContentObserver mObserver = new ForceLoadContentObserver();
private final RootsCache mRoots; private final RootsCache mRoots;
private final State mState; private final State mState;
@ -34,6 +36,9 @@ public class RootsLoader extends AsyncTaskLoader<Collection<RootInfo>> {
super(context); super(context);
mRoots = roots; mRoots = roots;
mState = state; mState = state;
getContext().getContentResolver()
.registerContentObserver(RootsCache.sNotificationUri, false, mObserver);
} }
@Override @Override
@ -77,5 +82,7 @@ public class RootsLoader extends AsyncTaskLoader<Collection<RootInfo>> {
onStopLoading(); onStopLoading();
mResult = null; mResult = null;
getContext().getContentResolver().unregisterContentObserver(mObserver);
} }
} }