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

Commit ef724a9f authored by Mady Mellor's avatar Mady Mellor
Browse files

Fix indexing after slices api changes 

Test: make -j40 RunSettingsGoogleRoboTests
      make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Slice"
Change-Id: Ib599a8c814942a80d7b60fc3b40b284ce2b55775
parent 097cfa72

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

+5 −4
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import androidx.slice.SliceViewManager; 
import androidx.slice.SliceViewManager.SliceCallback;

import androidx.slice.core.SliceQuery;

import androidx.slice.widget.ListContent;

import androidx.slice.widget.SliceContent;



public class DeviceIndexUpdateJobService extends JobService {
@@ -134,7 +135,7 @@ public class DeviceIndexUpdateJobService extends JobService { 


    protected CharSequence findTitle(Slice loadedSlice, SliceMetadata metaData) {

        ListContent content = new ListContent(null, loadedSlice);

        SliceItem headerItem = content.getHeaderItem();

        SliceContent headerItem = content.getHeader();

        if (headerItem == null) {

            if (content.getRowItems().size() != 0) {

                headerItem = content.getRowItems().get(0);
@@ -143,15 +144,15 @@ public class DeviceIndexUpdateJobService extends JobService { 
            }

        }

        // Look for a title, then large text, then any text at all.

        SliceItem title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_TITLE, null);

        SliceItem title = SliceQuery.find(headerItem.getSliceItem(), FORMAT_TEXT, HINT_TITLE, null);

        if (title != null) {

            return title.getText();

        }

        title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_LARGE, null);

        title = SliceQuery.find(headerItem.getSliceItem(), FORMAT_TEXT, HINT_LARGE, null);

        if (title != null) {

            return title.getText();

        }

        title = SliceQuery.find(headerItem, FORMAT_TEXT);

        title = SliceQuery.find(headerItem.getSliceItem(), FORMAT_TEXT);

        if (title != null) {

            return title.getText();

        }

tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java

+6 −9
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ import androidx.slice.SliceProvider; 
import androidx.slice.core.SliceAction;

import androidx.slice.core.SliceQuery;

import androidx.slice.widget.ListContent;

import androidx.slice.widget.SliceContent;

import androidx.slice.widget.RowContent;

import androidx.slice.widget.SliceLiveData;
@@ -367,31 +368,27 @@ public class WifiCallingSliceHelperTest { 


        // Get all the rows

        final ListContent listContent = new ListContent(mContext, slice);

        final ArrayList<SliceItem> rowItems = listContent.getRowItems();

        final ArrayList<SliceContent> rowItems = listContent.getRowItems();



        assertThat(rowItems.size()).isEqualTo(4 /* 4 items including header */);



        // First row is HEADER

        SliceItem rowSliceItem = rowItems.get(0);

        RowContent rowContent =  new RowContent(mContext, rowSliceItem, true);

        RowContent rowContent = (RowContent) rowItems.get(0);

        assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(

                R.string.wifi_calling_mode_title));



        // next is WIFI_ONLY

        rowSliceItem = rowItems.get(1);

        rowContent =  new RowContent(mContext, rowSliceItem, false);

        rowContent =  (RowContent) rowItems.get(1);

        assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(

                com.android.internal.R.string.wfc_mode_wifi_only_summary));



        // next is WIFI_PREFERRED

        rowSliceItem = rowItems.get(2);

        rowContent =  new RowContent(mContext, rowSliceItem, false);

        rowContent =  (RowContent) rowItems.get(2);

        assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(

                com.android.internal.R.string.wfc_mode_wifi_preferred_summary));



        // next is CELLULAR_PREFERRED

        rowSliceItem = rowItems.get(3);

        rowContent =  new RowContent(mContext, rowSliceItem, false);

        rowContent =  (RowContent) rowItems.get(3);

        assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(

                com.android.internal.R.string.wfc_mode_cellular_preferred_summary));