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

Commit b8241875 authored by Jason Chiu's avatar Jason Chiu
Browse files

[DO NOT MERGE] Update contextual cards display mechanism 

1. Make Wi-Fi card default to collapse.
2. Support showing a default card when there's no displayable card.
3. Solve the problem of icon not showing for cached slices in card
renderer

Bug: 163288869
Fixes: 159092915
Test: manual, robotest
Change-Id: Ie8b61ad58410337334e29b7a794353b0c6a6ba8c
parent 27f7aae8

src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProvider.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,9 @@ public interface ContextualCardFeatureProvider { 
    /** Get contextual cards from the card provider */

    /** Get contextual cards from the card provider */

    Cursor getContextualCards();

    Cursor getContextualCards();





    /** Get the default contextual card to display */

    ContextualCard getDefaultContextualCard();



    /**

    /**

     * Mark a specific {@link ContextualCard} as dismissed with dismissal signal in the database

     * Mark a specific {@link ContextualCard} as dismissed with dismissal signal in the database

     * to indicate that the card has been dismissed.

     * to indicate that the card has been dismissed.

src/com/android/settings/homepage/contextualcards/ContextualCardFeatureProviderImpl.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,11 @@ public class ContextualCardFeatureProviderImpl implements ContextualCardFeatureP 
        return cursor;

        return cursor;

    }

    }





    @Override

    public ContextualCard getDefaultContextualCard() {

        return null;

    }



    @Override

    @Override

    public int markCardAsDismissed(Context context, String cardName) {

    public int markCardAsDismissed(Context context, String cardName) {

        final SQLiteDatabase db = CardDatabaseHelper.getInstance(mContext).getWritableDatabase();

        final SQLiteDatabase db = CardDatabaseHelper.getInstance(mContext).getWritableDatabase();

src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -164,6 +164,16 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard> 
                    SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW,

                    SettingsEnums.ACTION_CONTEXTUAL_CARD_NOT_SHOW,

                    ContextualCardLogUtils.buildCardListLog(hiddenCards));

                    ContextualCardLogUtils.buildCardListLog(hiddenCards));

        }

        }



        // Add a default card if no other visible cards

        if (visibleCards.isEmpty() && maxCardCount == 1) {

            final ContextualCard defaultCard = FeatureFactory.getFactory(mContext)

                    .getContextualCardFeatureProvider(mContext).getDefaultContextualCard();

            if (defaultCard != null) {

                Log.i(TAG, "Default card: " + defaultCard.getSliceUri());

                visibleCards.add(defaultCard);

            }

        }

        return visibleCards;

        return visibleCards;

    }

    }

src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ import com.android.settings.homepage.contextualcards.CardContentProvider; 
import com.android.settings.homepage.contextualcards.ContextualCard;

import com.android.settings.homepage.contextualcards.ContextualCard;

import com.android.settings.homepage.contextualcards.ContextualCardRenderer;

import com.android.settings.homepage.contextualcards.ContextualCardRenderer;

import com.android.settings.homepage.contextualcards.ControllerRendererPool;

import com.android.settings.homepage.contextualcards.ControllerRendererPool;

import com.android.settings.homepage.contextualcards.slices.SliceFullCardRendererHelper.SliceViewHolder;

import com.android.settingslib.utils.ThreadUtils;

import com.android.settingslib.utils.ThreadUtils;





import java.util.Map;

import java.util.Map;
@@ -105,7 +104,7 @@ public class SliceContextualCardRenderer implements ContextualCardRenderer, Life 




        // Show cached slice first before slice binding completed to avoid jank.

        // Show cached slice first before slice binding completed to avoid jank.

        if (holder.getItemViewType() != VIEW_TYPE_HALF_WIDTH) {

        if (holder.getItemViewType() != VIEW_TYPE_HALF_WIDTH) {

            ((SliceViewHolder) holder).sliceView.setSlice(card.getSlice());

            mFullCardHelper.bindView(holder, card, card.getSlice());

        }

        }





        LiveData<Slice> sliceLiveData = mSliceLiveDataMap.get(uri);

        LiveData<Slice> sliceLiveData = mSliceLiveDataMap.get(uri);

src/com/android/settings/wifi/slice/ContextualWifiSlice.java

+22 −8
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import android.net.NetworkInfo.State; 
import android.net.Uri;

import android.net.Uri;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;

import android.net.wifi.WifiManager;

import android.provider.Settings;

import android.text.TextUtils;

import android.text.TextUtils;





import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;
@@ -44,6 +45,9 @@ import com.android.settingslib.wifi.AccessPoint; 
 */

 */

public class ContextualWifiSlice extends WifiSlice {

public class ContextualWifiSlice extends WifiSlice {





    @VisibleForTesting

    static final String CONTEXTUAL_WIFI_EXPANDABLE = "contextual_wifi_expandable";



    @VisibleForTesting

    @VisibleForTesting

    static final int COLLAPSED_ROW_COUNT = 0;

    static final int COLLAPSED_ROW_COUNT = 0;
@@ -63,6 +67,7 @@ public class ContextualWifiSlice extends WifiSlice { 




    @Override

    @Override

    public Slice getSlice() {

    public Slice getSlice() {

        if (isExpandable()) {

            final long currentUiSession = FeatureFactory.getFactory(mContext)

            final long currentUiSession = FeatureFactory.getFactory(mContext)

                    .getSlicesFeatureProvider().getUiSessionToken();

                    .getSlicesFeatureProvider().getUiSessionToken();

            if (currentUiSession != sActiveUiSession) {

            if (currentUiSession != sActiveUiSession) {
@@ -71,6 +76,9 @@ public class ContextualWifiSlice extends WifiSlice { 
            } else if (!mWifiManager.isWifiEnabled()) {

            } else if (!mWifiManager.isWifiEnabled()) {

                sApRowCollapsed = false;

                sApRowCollapsed = false;

            }

            }

        } else {

            sApRowCollapsed = true;

        }

        return super.getSlice();

        return super.getSlice();

    }

    }
@@ -87,12 +95,18 @@ public class ContextualWifiSlice extends WifiSlice { 
    protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled, AccessPoint accessPoint) {

    protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled, AccessPoint accessPoint) {

        final ListBuilder.RowBuilder builder = super.getHeaderRow(isWifiEnabled, accessPoint);

        final ListBuilder.RowBuilder builder = super.getHeaderRow(isWifiEnabled, accessPoint);

        builder.setTitleItem(getHeaderIcon(isWifiEnabled, accessPoint), ListBuilder.ICON_IMAGE);

        builder.setTitleItem(getHeaderIcon(isWifiEnabled, accessPoint), ListBuilder.ICON_IMAGE);

        if (sApRowCollapsed) {

        if (sApRowCollapsed && isWifiEnabled) {

            builder.setSubtitle(getSubtitle(accessPoint));

            builder.setSubtitle(getSubtitle(accessPoint));

        }

        }

        return builder;

        return builder;

    }

    }





    private boolean isExpandable() {

        // Return whether this slice can be expandable.

        return Settings.Global.getInt(mContext.getContentResolver(), CONTEXTUAL_WIFI_EXPANDABLE, 0)

                != 0;

    }



    private IconCompat getHeaderIcon(boolean isWifiEnabled, AccessPoint accessPoint) {

    private IconCompat getHeaderIcon(boolean isWifiEnabled, AccessPoint accessPoint) {

        final Drawable drawable;

        final Drawable drawable;

        final int tint;

        final int tint;