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

Commit 5a3e33a8 authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge changes Idc4c2c14,Ibea016c6,I49ab58c3,Id911d405,I0f17dc5f, ... into nyc-mr1-dev 

* changes:
  Improved the transition when clicking on the last notification
  Fixed a bug that could lead to an empty notification
  Removed contentDescriptions that hindered accessibility usability
  Fixes a bug where setting a null bigLargeIcon would not clear it
  Fixed the transition of the background of the notifications
  Fixed a bug where the notification would fade out in a ugly way
parents c830bd10 61b350cc

core/java/android/app/Notification.java

+7 −0
Original line number Diff line number Diff line
@@ -4424,9 +4424,15 @@ public class Notification implements Parcelable 
            //          mN.mLargeIcon

            //   2. !mBigLargeIconSet -> mN.mLargeIcon applies

            Icon oldLargeIcon = null;

            Bitmap largeIconLegacy = null;

            if (mBigLargeIconSet) {

                oldLargeIcon = mBuilder.mN.mLargeIcon;

                mBuilder.mN.mLargeIcon = mBigLargeIcon;

                // The legacy largeIcon might not allow us to clear the image, as it's taken in

                // replacement if the other one is null. Because we're restoring these legacy icons

                // for old listeners, this is in general non-null.

                largeIconLegacy = mBuilder.mN.largeIcon;

                mBuilder.mN.largeIcon = null;

            }



            RemoteViews contentView = getStandardView(mBuilder.getBigPictureLayoutResource());
@@ -4438,6 +4444,7 @@ public class Notification implements Parcelable 


            if (mBigLargeIconSet) {

                mBuilder.mN.mLargeIcon = oldLargeIcon;

                mBuilder.mN.largeIcon = largeIconLegacy;

            }



            contentView.setImageViewBitmap(R.id.big_picture, mPicture);

packages/Keyguard/res/layout/keyguard_password_view.xml

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    androidprv:layout_maxHeight="@dimen/keyguard_security_height"

    android:gravity="bottom"

    android:contentDescription="@string/keyguard_accessibility_password_unlock"

    >



    <Space

packages/Keyguard/res/layout/keyguard_pin_view.xml

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
        androidprv:layout_maxWidth="@dimen/keyguard_security_width"

        androidprv:layout_maxHeight="@dimen/keyguard_security_max_height"

        android:orientation="vertical"

        android:contentDescription="@string/keyguard_accessibility_pin_unlock"

        >

    <include layout="@layout/keyguard_message_area"

             android:layout_width="match_parent"

packages/Keyguard/res/values/strings.xml

+0 −9
Original line number Diff line number Diff line
@@ -103,15 +103,6 @@ 
    <!-- Time format strings for fall-back clock widget -->

    <string name="keyguard_widget_24_hours_format" translatable="false">kk\uee01mm</string>



    <string name="keyguard_accessibility_pattern_unlock">Pattern unlock.</string>

    <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_pin_unlock">Pin unlock.</string>

    <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_password_unlock">Password unlock.</string>

    <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">Pattern area.</string>

    <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_slide_area">Slide area.</string>

    <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_pin_area">PIN area</string>

    <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ 
    <!-- The amount to scale each of the status bar icons by. A value of 1 means no scaling. -->

    <item name="status_bar_icon_scale_factor" format="float" type="dimen">1.0</item>



    <!-- max height of a notification such that the content can still fade out when closing -->

    <dimen name="max_notification_fadeout_height">100dp</dimen>



    <!-- Height of a small notification in the status bar-->

    <dimen name="notification_min_height">92dp</dimen>