PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix loading screens for manage and running apps

Browse Source 
Also add loading screen to manage permissions as this can take a
long time to load in some circumstances. Build loading screens into
Utils and SettingsPreferenceFragment so that it can be easily used
other places in the future.

Change-Id: I7febd06695487e02ced793a9fd418051b5f0eab8
This commit is contained in:
Jason Monk
2015-03-31 12:59:33 -04:00
parent 5f937152a5
commit b5aa73f46f
9 changed files with 123 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -158,6 +158,11 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
unregisterObserverIfNeeded();
}
public void showLoadingWhenEmpty() {
View loading = getView().findViewById(R.id.loading_container);
getListView().setEmptyView(loading);
}
public void registerObserverIfNeeded() {
if (!mIsDataSetObserverRegistered) {
if (mCurrentRootAdapter != null) {

40
src/com/android/settings/Utils.java
View File

@@ -39,8 +39,8 @@ import android.content.pm.ResolveInfo;
import android.content.pm.Signature;
import android.content.pm.UserInfo;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.content.res.Resources.NotFoundException;
import android.content.res.TypedArray;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -74,6 +74,9 @@ import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.Animation.AnimationListener;
import android.view.animation.AnimationUtils;
import android.widget.ListView;
import android.widget.TabWidget;
@@ -1158,4 +1161,39 @@ public final class Utils {
? R.string.launch_defaults_some
: R.string.launch_defaults_none);
}
public static void handleLoadingContainer(View loading, View doneLoading, boolean done,
boolean animate) {
setViewShown(loading, !done, animate);
setViewShown(doneLoading, done, animate);
}
private static void setViewShown(final View view, boolean shown, boolean animate) {
if (animate) {
Animation animation = AnimationUtils.loadAnimation(view.getContext(),
shown ? android.R.anim.fade_in : android.R.anim.fade_out);
if (shown) {
view.setVisibility(View.VISIBLE);
} else {
animation.setAnimationListener(new AnimationListener() {
@Override
public void onAnimationStart(Animation animation) {
}
@Override
public void onAnimationRepeat(Animation animation) {
}
@Override
public void onAnimationEnd(Animation animation) {
view.setVisibility(View.INVISIBLE);
}
});
}
view.startAnimation(animation);
} else {
view.clearAnimation();
view.setVisibility(shown ? View.VISIBLE : View.INVISIBLE);
}
}
}

16
src/com/android/settings/applications/ManageApplications.java
View File

@@ -358,6 +358,7 @@ public class ManageApplications extends InstrumentedFragment
updateOptionsMenu();
if (mApplications != null) {
mApplications.resume(mSortOrder);
mApplications.updateLoading();
}
}
@@ -746,17 +747,20 @@ public class ManageApplications extends InstrumentedFragment
}
notifyDataSetChanged();
if (entries == null) {
mManageApplications.mListContainer.setVisibility(View.INVISIBLE);
mManageApplications.mLoadingContainer.setVisibility(View.VISIBLE);
} else {
mManageApplications.mListContainer.setVisibility(View.VISIBLE);
mManageApplications.mLoadingContainer.setVisibility(View.GONE);
if (mEntries.size() != 0
&& mManageApplications.mListContainer.getVisibility() != View.VISIBLE) {
Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
mManageApplications.mListContainer, true, true);
}
mManageApplications.setHasDisabled(hasDisabledApps());
}
private void updateLoading() {
Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
mManageApplications.mListContainer, mEntries.size() != 0, false);
}
private boolean hasDisabledApps() {
ArrayList<AppEntry> allApps = mSession.getAllApps();
for (int i = 0; i < allApps.size(); i++) {

8
src/com/android/settings/applications/ManagePermissions.java
View File

@@ -36,7 +36,6 @@ public class ManagePermissions extends SettingsPreferenceFragment
private static final String TAG = "ManagePermissions";
private boolean mLoadComplete;
private PermissionsInfo mPermissionsInfo;
@Override
@@ -46,6 +45,13 @@ public class ManagePermissions extends SettingsPreferenceFragment
mPermissionsInfo = new PermissionsInfo(getActivity(), this);
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
showLoadingWhenEmpty();
}
private void refreshUi() {
PreferenceScreen screen = getPreferenceScreen();
if (screen == null) {

20
src/com/android/settings/applications/RunningServices.java
View File

@@ -23,9 +23,9 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AnimationUtils;
import com.android.settings.R;
import com.android.settings.Utils;
public class RunningServices extends Fragment {
@@ -69,12 +69,7 @@ public class RunningServices extends Fragment {
public void onResume() {
super.onResume();
boolean haveData = mRunningProcessesView.doResume(this, mRunningProcessesAvail);
if (haveData) {
mRunningProcessesView.setVisibility(View.VISIBLE);
mLoadingContainer.setVisibility(View.INVISIBLE);
} else {
mLoadingContainer.setVisibility(View.VISIBLE);
}
Utils.handleLoadingContainer(mLoadingContainer, mRunningProcessesView, haveData, false);
}
@Override
@@ -110,19 +105,10 @@ public class RunningServices extends Fragment {
mOptionsMenu.findItem(SHOW_BACKGROUND_PROCESSES).setVisible(!showingBackground);
}
private void handleRunningProcessesAvail() {
mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(getActivity(),
android.R.anim.fade_out));
mRunningProcessesView.startAnimation(AnimationUtils.loadAnimation(getActivity(),
android.R.anim.fade_in));
mRunningProcessesView.setVisibility(View.VISIBLE);
mLoadingContainer.setVisibility(View.GONE);
}
private final Runnable mRunningProcessesAvail = new Runnable() {
@Override
public void run() {
handleRunningProcessesAvail();
Utils.handleLoadingContainer(mLoadingContainer, mRunningProcessesView, true, true);
}
};