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

Settings timeout for suggestions

Browse Source 
If loading suggestions takes too long (750ms)
settings will display just the categories
so the user does not get confused.

Test: Forthcoming
Bug: 31203004
Change-Id: Ic9866a5ccdcef965908db8c4592435a5d252f7b0
This commit is contained in:
Salvador Martinez
2016-09-19 17:02:37 -07:00
parent d654c889b8
commit d969a5f53d
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/dashboard/DashboardSummary.java
View File

@@ -20,6 +20,7 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -48,6 +49,7 @@ public class DashboardSummary extends InstrumentedFragment
FocusRecyclerView.FocusListener { FocusRecyclerView.FocusListener {
public static final boolean DEBUG = false; public static final boolean DEBUG = false;
private static final boolean DEBUG_TIMING = false; private static final boolean DEBUG_TIMING = false;
private static final int MAX_WAIT_MILLIS = 700;
private static final String TAG = "DashboardSummary"; private static final String TAG = "DashboardSummary";
public static final String[] INITIAL_ITEMS = new String[] { public static final String[] INITIAL_ITEMS = new String[] {
@@ -65,6 +67,8 @@ public class DashboardSummary extends InstrumentedFragment
private static final String EXTRA_SUGGESTION_SHOWN_LOGGED = "suggestions_shown_logged"; private static final String EXTRA_SUGGESTION_SHOWN_LOGGED = "suggestions_shown_logged";
private static final String EXTRA_SUGGESTION_HIDDEN_LOGGED = "suggestions_hidden_logged"; private static final String EXTRA_SUGGESTION_HIDDEN_LOGGED = "suggestions_hidden_logged";
private final Handler mHandler = new Handler();
private FocusRecyclerView mDashboard; private FocusRecyclerView mDashboard;
private DashboardAdapter mAdapter; private DashboardAdapter mAdapter;
private SummaryLoader mSummaryLoader; private SummaryLoader mSummaryLoader;
@@ -217,6 +221,14 @@ public class DashboardSummary extends InstrumentedFragment
// recheck to see if any suggestions have been changed. // recheck to see if any suggestions have been changed.
new SuggestionLoader().execute(); new SuggestionLoader().execute();
// Set categories on their own if loading suggestions takes too long.
mHandler.postDelayed(() -> {
final Activity activity = getActivity();
if (activity != null) {
mAdapter.setCategoriesAndSuggestions(
((SettingsActivity) activity).getDashboardCategories(), null);
}
}, MAX_WAIT_MILLIS);
} }
@Override @Override
@@ -255,6 +267,9 @@ public class DashboardSummary extends InstrumentedFragment
@Override @Override
protected void onPostExecute(List<Tile> tiles) { protected void onPostExecute(List<Tile> tiles) {
// tell handler that suggestions were loaded quickly enough
mHandler.removeCallbacksAndMessages(null);
final Activity activity = getActivity(); final Activity activity = getActivity();
if (activity == null) { if (activity == null) {
return; return;