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

Commit 12f23952 authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge "Code cleanup and visual polish for hybrid views" into tm-qpr-dev

parents 52f51d89 ed36ea6c

packages/SystemUI/res/layout/hybrid_conversation_notification.xml

+4 −2
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:singleLine="true"

        style="?attr/hybridNotificationTextStyle"

        android:paddingEnd="4dp"

        style="@*android:style/Widget.DeviceDefault.Notification.Text"

    />



    <TextView
@@ -65,6 +66,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:singleLine="true"

        style="?attr/hybridNotificationTextStyle"

        android:paddingEnd="4dp"

        style="@*android:style/Widget.DeviceDefault.Notification.Text"

    />

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

packages/SystemUI/res/layout/hybrid_notification.xml

+6 −3
Original line number Diff line number Diff line
@@ -20,19 +20,22 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="bottom|start"

    style="?attr/hybridNotificationStyle">

    android:paddingStart="@*android:dimen/notification_content_margin_start"

    android:paddingEnd="12dp">

    <TextView

        android:id="@+id/notification_title"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:singleLine="true"

        style="?attr/hybridNotificationTitleStyle"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"

        android:paddingEnd="4dp"

    />

    <TextView

        android:id="@+id/notification_text"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:singleLine="true"

        style="?attr/hybridNotificationTextStyle"

        android:paddingEnd="4dp"

        style="@*android:style/Widget.DeviceDefault.Notification.Text"

    />

</com.android.systemui.statusbar.notification.row.HybridNotificationView>
 
 No newline at end of file

packages/SystemUI/res/values/attrs.xml

+0 −6
Original line number Diff line number Diff line
@@ -108,12 +108,6 @@ 
        <attr name="android:layout" />

    </declare-styleable>



    <declare-styleable name="HybridNotificationTheme">

        <attr name="hybridNotificationStyle" format="reference" />

        <attr name="hybridNotificationTitleStyle" format="reference" />

        <attr name="hybridNotificationTextStyle" format="reference" />

    </declare-styleable>



    <declare-styleable name="PluginInflateContainer">

        <attr name="viewType" format="string" />

    </declare-styleable>

packages/SystemUI/res/values/styles.xml

+0 −24
Original line number Diff line number Diff line
@@ -17,30 +17,6 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

           xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">



    <!-- HybridNotification themes and styles -->



    <style name="HybridNotification">

        <item name="hybridNotificationStyle">@style/hybrid_notification</item>

        <item name="hybridNotificationTitleStyle">@style/hybrid_notification_title</item>

        <item name="hybridNotificationTextStyle">@style/hybrid_notification_text</item>

    </style>



    <style name="hybrid_notification">

        <item name="android:paddingStart">@*android:dimen/notification_content_margin_start</item>

        <item name="android:paddingEnd">12dp</item>

    </style>



    <style name="hybrid_notification_title">

        <item name="android:paddingEnd">4dp</item>

        <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault.Notification.Title</item>

    </style>



    <style name="hybrid_notification_text"

           parent="@*android:style/Widget.DeviceDefault.Notification.Text">

        <item name="android:paddingEnd">4dp</item>

    </style>





    <style name="TextAppearance.StatusBar.Clock" parent="@*android:style/TextAppearance.StatusBar.Icon">

        <item name="android:textSize">@dimen/status_bar_clock_size</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

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

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public class HybridConversationNotificationView extends HybridNotificationView { 
        mConversationIconView = requireViewById(com.android.internal.R.id.conversation_icon);

        mConversationFacePile = requireViewById(com.android.internal.R.id.conversation_face_pile);

        mConversationSenderName = requireViewById(R.id.conversation_notification_sender);

        applyTextColor(mConversationSenderName, mSecondaryTextColor);

        mFacePileSize = getResources()

                .getDimensionPixelSize(R.dimen.conversation_single_line_face_pile_size);

        mFacePileAvatarSize = getResources()
@@ -75,6 +76,9 @@ public class HybridConversationNotificationView extends HybridNotificationView { 
                .getDimensionPixelSize(R.dimen.conversation_single_line_avatar_size);

        mFacePileProtectionWidth = getResources().getDimensionPixelSize(

                R.dimen.conversation_single_line_face_pile_protection_width);

        mTransformationHelper.setCustomTransformation(

                new FadeOutAndDownWithTitleTransformation(mConversationSenderName),

                mConversationSenderName.getId());

        mTransformationHelper.addViewTransformingToSimilar(mConversationIconView);

        mTransformationHelper.addTransformedView(mConversationSenderName);

    }