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

Merge changes I8ce427ea,If33c3d3a,I579be569,I755c04da

Browse Source 
* changes:
  move search test package to sdk 26
  Update accessibilityserviceresult test to sdk 26
  Update IntentSearchViewHolderTest to sdk 26
  fix DatabaseIndexingManagerTest hanging in tests
This commit is contained in:
TreeHugger Robot
2017-12-02 01:32:49 +00:00
committed by Android (Google) Code Review
parent 2d5aa05f8e e67e8fa9c7
commit 61691b5a4f
31 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/search/IndexDatabaseHelper.java
View File

@@ -293,7 +293,8 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
}
static void setBuildIndexed(Context context, String buildNo) {
context.getSharedPreferences(SHARED_PREFS_TAG, 0).edit().putBoolean(buildNo, true).commit();
// Use #apply() instead of #commit() since #commit() Robolectric loop indefinitely in sdk 26
context.getSharedPreferences(SHARED_PREFS_TAG, 0).edit().putBoolean(buildNo, true).apply();
}
private void dropTables(SQLiteDatabase db) {

10
src/com/android/settings/search/SearchViewHolder.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.search;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
@@ -26,6 +27,7 @@ import android.util.IconDrawableFactory;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import android.support.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
@@ -84,8 +86,7 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
AppSearchResult appResult = (AppSearchResult) result;
PackageManager pm = fragment.getActivity().getPackageManager();
UserHandle userHandle = appResult.getAppUserHandle();
Drawable badgedIcon =
mIconDrawableFactory.getBadgedIcon(appResult.info, userHandle.getIdentifier());
Drawable badgedIcon = getBadgedIcon(appResult.info, userHandle.getIdentifier());
iconView.setImageDrawable(badgedIcon);
titleView.setContentDescription(
pm.getUserBadgedLabel(appResult.info.loadLabel(pm), userHandle));
@@ -112,4 +113,9 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
breadcrumbView.setText(breadcrumb);
breadcrumbView.setVisibility(View.VISIBLE);
}
@VisibleForTesting
Drawable getBadgedIcon(ApplicationInfo info, int userId) {
return mIconDrawableFactory.getBadgedIcon(info, userId);
}
}