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

Commit e60307cd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Link partial convo controls to Settings" into rvc-dev am: 629ebb17 am: 1df8f405 

Change-Id: I09a11396d12cbac3bd133be8bcfb5cf0d840e181
parents 38420cca 1df8f405

packages/SystemUI/res/layout/partial_conversation_info.xml

+26 −15
Original line number Diff line number Diff line
@@ -144,6 +144,16 @@ 
        android:clipToPadding="false"

        android:orientation="vertical">



        <com.android.systemui.statusbar.notification.row.ButtonLinearLayout

            android:id="@+id/settings_link"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:padding="@dimen/notification_importance_button_padding"

            android:clickable="true"

            android:focusable="true"

            android:background="@drawable/notification_guts_priority_button_bg"

            android:orientation="vertical">



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"
@@ -163,6 +173,7 @@ 
                    android:layout_height="wrap_content"

                    style="@style/TextAppearance.NotificationImportanceChannelGroup" />

            </LinearLayout>

        </com.android.systemui.statusbar.notification.row.ButtonLinearLayout>



        <RelativeLayout

            android:id="@+id/bottom_buttons"

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/PartialConversationInfo.java

+4 −1
Original line number Diff line number Diff line
@@ -135,10 +135,13 @@ public class PartialConversationInfo extends LinearLayout implements 
    }



    private void bindActions() {

        final OnClickListener settingsOnClickListener = getSettingsOnClickListener();

        final View settingsButton = findViewById(R.id.info);

        settingsButton.setOnClickListener(getSettingsOnClickListener());

        settingsButton.setOnClickListener(settingsOnClickListener);

        settingsButton.setVisibility(settingsButton.hasOnClickListeners() ? VISIBLE : GONE);



        findViewById(R.id.settings_link).setOnClickListener(settingsOnClickListener);



        TextView msg = findViewById(R.id.non_configurable_text);

        msg.setText(getResources().getString(R.string.no_shortcut, mAppName));

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/PartialConversationInfoTest.java

+24 −0
Original line number Diff line number Diff line
@@ -355,6 +355,30 @@ public class PartialConversationInfoTest extends SysuiTestCase { 
        assertEquals(0, latch.getCount());

    }



    @Test

    public void testBindNotification_SetsOnClickListenerForSettings_mainText() {

        final CountDownLatch latch = new CountDownLatch(1);

        mInfo.bindNotification(

                mMockPackageManager,

                mMockINotificationManager,

                mChannelEditorDialogController,

                TEST_PACKAGE_NAME,

                mNotificationChannel,

                mNotificationChannelSet,

                mEntry,

                (View v, NotificationChannel c, int appUid) -> {

                    assertEquals(mNotificationChannel, c);

                    latch.countDown();

                },

                true,

                false);



        final View settingsButton = mInfo.findViewById(R.id.settings_link);

        settingsButton.performClick();

        // Verify that listener was triggered.

        assertEquals(0, latch.getCount());

    }



    @Test

    public void testBindNotification_SettingsButtonInvisibleWhenNoClickListener() {

        mInfo.bindNotification(