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

Merge changes I6e73bcf9,I257ba108

Browse Source 
* changes:
  Add a timeout waiting for contextual card loader.
  Set setting back to default when turning off dev option
This commit is contained in:
Fan Zhang
2018-12-13 04:03:28 +00:00
committed by Android (Google) Code Review
parent 5f10245da9 ad12b76a98
commit e824c7e005
11 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
View File

@@ -31,6 +31,7 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.text.format.DateUtils;
import android.util.Log;
import androidx.annotation.NonNull;
@@ -49,6 +50,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
@VisibleForTesting
static final int DEFAULT_CARD_COUNT = 4;
static final int CARD_CONTENT_LOADER_ID = 1;
static final long CARD_CONTENT_LOADER_TIMEOUT_MS = DateUtils.SECOND_IN_MILLIS;
private static final String TAG = "ContextualCardLoader";