Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61691b5a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I8ce427ea,If33c3d3a,I579be569,I755c04da 

* changes:
  move search test package to sdk 26
  Update accessibilityserviceresult test to sdk 26
  Update IntentSearchViewHolderTest to sdk 26
  fix DatabaseIndexingManagerTest hanging in tests
parents 2d5aa05f e67e8fa9

src/com/android/settings/search/IndexDatabaseHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

src/com/android/settings/search/SearchViewHolder.java

+8 −2
Original line number Diff line number Diff line
@@ -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);

    }

}
 
 No newline at end of file

tests/robotests/src/com/android/settings/search/AccessibilityServiceResultFutureTaskTest.java

+5 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.content.pm.ResolveInfo; 
import android.content.pm.ServiceInfo;

import android.graphics.Color;

import android.graphics.drawable.ColorDrawable;

import android.os.UserManager;

import android.view.accessibility.AccessibilityManager;



import com.android.settings.TestConfig;
@@ -46,7 +47,7 @@ import java.util.ArrayList; 
import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class AccessibilityServiceResultFutureTaskTest {



    private static final String QUERY = "test_query";
@@ -59,6 +60,8 @@ public class AccessibilityServiceResultFutureTaskTest { 
    private AccessibilityManager mAccessibilityManager;

    @Mock

    private SiteMapManager mSiteMapManager;

    @Mock

    private UserManager mUserManager;



    private AccessibilityServiceResultLoader.AccessibilityServiceResultCallable mCallable;
@@ -67,6 +70,7 @@ public class AccessibilityServiceResultFutureTaskTest { 
        MockitoAnnotations.initMocks(this);

        when(mContext.getSystemService(Context.ACCESSIBILITY_SERVICE))

                .thenReturn(mAccessibilityManager);

        when((Object)mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);

        when(mContext.getPackageManager()).thenReturn(mPackageManager);



        mCallable = new AccessibilityServiceResultLoader.AccessibilityServiceResultCallable(

tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ import java.util.Collections; 
import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class BaseSearchIndexProviderTest {



    private static final String TEST_PREF_KEY = "test_pref_key";

tests/robotests/src/com/android/settings/search/CursorToSearchResultConverterTest.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ import java.util.List; 
import java.util.Set;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)

public class CursorToSearchResultConverterTest {



    private static final List<String> TITLES = Arrays.asList("title1", "title2", "title3");