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

Commit 1e24cb02 authored by Emily Chuang's avatar Emily Chuang Committed by Yi-Ling Chuang
Browse files

Add contextual card dismissal implementation 

When users clcik on the remove button in dismissal view, the card should
be marked as dismissed in the database, and the UI should be refreshed.

Bug: 113783548, 119594116
Test: robotests
Change-Id: I980600c4c0753ad5abc52ae63bac7196a4b818f1
parent 4942fd2a

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

+8 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.homepage.contextualcards;



import android.content.ContentProvider;

import android.content.ContentResolver;

import android.content.ContentValues;

import android.content.UriMatcher;

import android.database.Cursor;
@@ -36,10 +37,15 @@ import com.android.settingslib.utils.ThreadUtils; 
 */

public class CardContentProvider extends ContentProvider {



    private static final String TAG = "CardContentProvider";



    public static final String CARD_AUTHORITY = "com.android.settings.homepage.CardContentProvider";



    public static final Uri URI = new Uri.Builder()

                    .scheme(ContentResolver.SCHEME_CONTENT)

                    .authority(CardContentProvider.CARD_AUTHORITY)

                    .appendPath(CardDatabaseHelper.CARD_TABLE)

                    .build();



    private static final String TAG = "CardContentProvider";

    /** URI matcher for ContentProvider queries. */

    private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);

    /** URI matcher type for cards table */

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

+7 −4
Original line number Diff line number Diff line
@@ -209,16 +209,19 @@ public class CardDatabaseHelper extends SQLiteOpenHelper { 
     * Mark a specific ContextualCard with dismissal flag in the database to indicate that the

     * card has been dismissed.

     *

     * @param cardName the card name of the ContextualCard which is dismissed by user.

     * @return updated row number

     * @param context Context

     * @param cardName The card name of the ContextualCard which is dismissed by user.

     * @return The number of rows updated

     */

    public int markContextualCardAsDismissed(String cardName) {

        final SQLiteDatabase database = this.getWritableDatabase();

    public int markContextualCardAsDismissed(Context context, String cardName) {

        final SQLiteDatabase database = getWritableDatabase();

        final ContentValues values = new ContentValues();

        values.put(CardColumns.CARD_DISMISSED, 1);

        final String selection = CardColumns.NAME + "=?";

        final String[] selectionArgs = {cardName};

        final int rowsUpdated = database.update(CARD_TABLE, values, selection, selectionArgs);

        database.close();

        context.getContentResolver().notifyChange(CardContentProvider.URI, null);

        return rowsUpdated;

    }

}

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

+26 −0
Original line number Diff line number Diff line
@@ -24,8 +24,11 @@ import android.content.ContentProviderClient; 
import android.content.ContentResolver;

import android.content.Context;

import android.content.pm.PackageManager;

import android.database.ContentObserver;

import android.database.Cursor;

import android.net.Uri;

import android.os.Handler;

import android.os.Looper;

import android.util.Log;



import androidx.annotation.NonNull;
@@ -60,6 +63,19 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard> 
        mContext = context.getApplicationContext();

    }



    @Override

    protected void onStartLoading() {

        super.onStartLoading();

        mContext.getContentResolver().registerContentObserver(CardContentProvider.URI,

                false /*notifyForDescendants*/, mObserver);

    }



    @Override

    protected void onStopLoading() {

        super.onStopLoading();

        mContext.getContentResolver().unregisterContentObserver(mObserver);

    }



    @Override

    protected void onDiscardResult(List<ContextualCard> result) {
@@ -184,4 +200,14 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard> 
        }

        return -1L;

    }



    private final ContentObserver mObserver = new ContentObserver(

            new Handler(Looper.getMainLooper())) {

        @Override

        public void onChange(boolean selfChange) {

            if (isStarted()) {

                forceLoad();

            }

        }

    };

}

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

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ public class ControllerRendererPool { 
        if (ConditionContextualCardController.class == clz) {

            return new ConditionContextualCardController(context);

        } else if (SliceContextualCardController.class == clz) {

            return new SliceContextualCardController();

            return new SliceContextualCardController(context);

        } else if (LegacySuggestionContextualCardController.class == clz) {

            return new LegacySuggestionContextualCardController(context);

        }

src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java

+5 −5
Original line number Diff line number Diff line
@@ -77,13 +77,13 @@ public class ConditionContextualCardController implements ContextualCardControll 


    @Override

    public void onActionClick(ContextualCard contextualCard) {



        final ConditionalContextualCard card = (ConditionalContextualCard) contextualCard;

        mConditionManager.onActionClick(card.getConditionId());

    }



    @Override

    public void onDismissed(ContextualCard contextualCard) {

        final ConditionalContextualCard card = (ConditionalContextualCard) contextualCard;

        mConditionManager.onActionClick(card.getConditionId());



    }



    @Override
@@ -93,8 +93,8 @@ public class ConditionContextualCardController implements ContextualCardControll 
        final boolean isOddNumber = conditionCards.size() % 2 == 1;

        if (isOddNumber) {

            final int lastIndex = conditionCards.size() - 1;

            final ConditionalContextualCard card = (ConditionalContextualCard) conditionCards.get(

                    lastIndex);

            final ConditionalContextualCard card = (ConditionalContextualCard) conditionCards

                    .get(lastIndex);

            conditionCards.set(lastIndex, card.mutate().setIsHalfWidth(false).build());

        }