diff options
author | Todd Volkert <tvolkert@google.com> | 2015-07-10 14:09:15 -0700 |
---|---|---|
committer | Todd Volkert <tvolkert@google.com> | 2015-07-10 14:29:44 -0700 |
commit | a11e73b95ac5d664d57e860fa41a00c7a50720b7 (patch) | |
tree | 2cab69fd6ab3e47778763f4e3d973e0ced4f703b /src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java | |
parent | 57b5d43f4839c62225cf616296f464b0739e66ba (diff) | |
download | android_packages_apps_PackageInstaller-a11e73b95ac5d664d57e860fa41a00c7a50720b7.tar.gz android_packages_apps_PackageInstaller-a11e73b95ac5d664d57e860fa41a00c7a50720b7.tar.bz2 android_packages_apps_PackageInstaller-a11e73b95ac5d664d57e860fa41a00c7a50720b7.zip |
Don't flash "No apps" while loading permissions screens on TV
This borrows from the work done in ag/722429, and:
1) makes it work for TV
2) fixes a bug in ag/722429 whereby we would show loading forever if
preference count was 0 (as opposed to correctly showing
"No apps" / "No permissions")
b/22090283
Change-Id: I7e2d8a4b99f99e2d1a933a2ac87494e38d2f77b9
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java')
-rw-r--r-- | src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java index 2b014b23..33462aef 100644 --- a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java @@ -88,7 +88,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setLoading(true, false); + setLoading(true /* loading */, false /* animate */); setHasOptionsMenu(true); final ActionBar ab = getActivity().getActionBar(); if (ab != null) { @@ -295,9 +295,7 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple } } - if (screen.getPreferenceCount() != 0) { - setLoading(false, true); - } + setLoading(false /* loading */, true /* animate */); if (mOnPermissionsLoadedListener != null) { mOnPermissionsLoadedListener.onPermissionsLoaded(permissionApps); @@ -384,13 +382,14 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple @Override public void onCreate(Bundle savedInstanceState) { mOuterFragment = (PermissionAppsFragment) getTargetFragment(); + setLoading(true /* loading */, false /* animate */); super.onCreate(savedInstanceState); } @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { if (mOuterFragment.mExtraScreen != null) { - setPreferenceScreen(mOuterFragment.mExtraScreen); + setPreferenceScreen(); } else { mOuterFragment.setOnPermissionsLoadedListener(this); } @@ -406,8 +405,13 @@ public final class PermissionAppsFragment extends PermissionsFrameFragment imple @Override public void onPermissionsLoaded(PermissionApps permissionApps) { - setPreferenceScreen(mOuterFragment.mExtraScreen); + setPreferenceScreen(); mOuterFragment.setOnPermissionsLoadedListener(null); } + + private void setPreferenceScreen() { + setPreferenceScreen(mOuterFragment.mExtraScreen); + setLoading(false /* loading */, true /* animate */); + } } } |