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

Commit b49cbcf2 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge changes Ibda62ba1,Ie338080b,Ic1cdd3ee 

* changes:
  Update char limit
  Update font family
  Increase expand/collapse tap target
parents 9ee730cc bfc47e46

res/layout/notification_history_app_layout.xml

+4 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
        android:id="@+id/app_header"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:background="@drawable/button_ripple_radius"

        android:paddingTop="12dp"

        android:paddingBottom="12dp"

        android:paddingStart="16dp">
@@ -58,13 +59,14 @@ 
                android:paddingTop="8dp"

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

        </LinearLayout>

        <ImageButton

        <ImageView

            android:id="@+id/expand"

            android:layout_alignParentEnd="true"

            android:layout_centerVertical="true"

            android:layout_height="48dp"

            android:layout_width="48dp"

            android:background="@drawable/button_ripple_radius"

            android:scaleType="center"

            android:contentDescription="@null"

            android:src="@*android:drawable/ic_expand_more"/>

    </RelativeLayout>

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -8310,7 +8310,7 @@ 
    <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->

    <string name="notification_pulse_title">Blink light</string>









    <!-- Configure Notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->









    <!-- Configure Notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=60] -->









    <string name="lock_screen_notifications_title">Notifications on lock screen</string>

















    <!-- Configure lock screen: Title for the option of unlocking directly to home. [CHAR LIMIT=30] -->

























res/values/styles.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -618,7 +618,7 @@

















    <style name="TextAppearance.NotificationImportanceButton">









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









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









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









        <item name="android:gravity">center</item>









    </style>










































src/com/android/settings/notification/history/NotificationHistoryActivity.java



+6
−5






























Original line number
Diff line number
Diff line







@@ -155,21 +155,22 @@ public class NotificationHistoryActivity extends Activity {

















            final View container = viewForPackage.findViewById(R.id.notification_list);









            container.setVisibility(View.GONE);









            ImageButton expand = viewForPackage.findViewById(R.id.expand);









            expand.setContentDescription(container.getVisibility() == View.VISIBLE









            View header = viewForPackage.findViewById(R.id.app_header);









            ImageView expand = viewForPackage.findViewById(R.id.expand);









            header.setStateDescription(container.getVisibility() == View.VISIBLE









                    ? getString(R.string.condition_expand_hide)









                    : getString(R.string.condition_expand_show));









            int finalI = i;









            expand.setOnClickListener(v -> {









            header.setOnClickListener(v -> {









                container.setVisibility(container.getVisibility() == View.VISIBLE









                        ? View.GONE : View.VISIBLE);









                expand.setImageResource(container.getVisibility() == View.VISIBLE









                        ? R.drawable.ic_expand_less









                        : com.android.internal.R.drawable.ic_expand_more);









                expand.setContentDescription(container.getVisibility() == View.VISIBLE









                header.setStateDescription(container.getVisibility() == View.VISIBLE









                        ? getString(R.string.condition_expand_hide)









                        : getString(R.string.condition_expand_show));









                expand.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);









                header.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);









                mUiEventLogger.logWithPosition(









                        (container.getVisibility() == View.VISIBLE)









                            ? NotificationHistoryEvent.NOTIFICATION_HISTORY_PACKAGE_HISTORY_OPEN