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

Commit c91d8c3e authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge changes I49263df9,Ie733ad38,I84908fd3,Ia4e869b8,I8240e763,Id5704cc5 

* changes:
  fix the build
  Don't re-show the ticker for a notification if they have set FLAG_ONLY_SHOW_ONCE.
  Notification.Builder.setAutoCancel() was setting the wrong flag.
  Allow taps on the ticker to pass through to the notification target view so the notification panel still opens.
  The whole title area of the notification panel should toggle the settings view.
  When the number field on a notifications is >100, just say "100+" instead of listing the number.
parents ea3c5717 8513dd58

api/current.xml

+27 −27
Original line number Diff line number Diff line
@@ -139031,7 +139031,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -139042,7 +139042,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -139053,7 +139053,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -139064,7 +139064,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -139187,7 +139187,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -139198,7 +139198,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -139255,7 +139255,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -139266,7 +139266,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -139299,7 +139299,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -139310,7 +139310,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -139321,7 +139321,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -139332,7 +139332,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -139354,7 +139354,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -139365,7 +139365,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -139376,7 +139376,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -139387,7 +139387,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -139420,7 +139420,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -139457,7 +139457,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -139468,7 +139468,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -139524,7 +139524,7 @@ 
 synchronized="false"

 static="true"

 final="false"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

>

</method>
@@ -256491,7 +256491,7 @@ 
 return="java.beans.PropertyChangeListener[]"

 abstract="false"

 native="false"

 synchronized="true"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"
@@ -256504,7 +256504,7 @@ 
 return="java.beans.PropertyChangeListener[]"

 abstract="false"

 native="false"

 synchronized="true"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"
@@ -256515,7 +256515,7 @@ 
 return="boolean"

 abstract="false"

 native="false"

 synchronized="true"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"
@@ -256528,7 +256528,7 @@ 
 return="void"

 abstract="false"

 native="false"

 synchronized="true"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"
@@ -256543,7 +256543,7 @@ 
 return="void"

 abstract="false"

 native="false"

 synchronized="true"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"
@@ -256800,7 +256800,7 @@ 
 return="void"

 abstract="false"

 native="false"

 synchronized="true"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"
@@ -256813,7 +256813,7 @@ 
 return="void"

 abstract="false"

 native="false"

 synchronized="true"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

core/java/android/app/Notification.java

+8 −3
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ public class Notification implements Parcelable 
        }



        public Builder setAutoCancel(boolean autoCancel) {

            setFlag(FLAG_ONLY_ALERT_ONCE, autoCancel);

            setFlag(FLAG_AUTO_CANCEL, autoCancel);

            return this;

        }
@@ -783,8 +783,13 @@ public class Notification implements Parcelable 
            if (mContentInfo != null) {

                contentView.setTextViewText(R.id.info, mContentInfo);

            } else if (mNumber > 0) {

                if (mNumber > 100) {

                    contentView.setTextViewText(R.id.info, mContext.getString(

                                R.string.status_bar_notification_info_overflow));

                } else {

                    NumberFormat f = NumberFormat.getIntegerInstance();

                    contentView.setTextViewText(R.id.info, f.format(mNumber));

                }

                contentView.setFloat(R.id.info, "setTextSize",

                        mContext.getResources().getDimensionPixelSize(

                            R.dimen.status_bar_content_number_size));

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -337,6 +337,11 @@ 
    <!-- status message in phone options dialog for when airplane mode is off -->

    <string name="global_actions_airplane_mode_off_status">Airplane mode is OFF</string>



    <!-- Text to use when the number in a notification info is too large (> 100).  Most likely does not need

    to be translated.  We do this so, for example, if the user has tens of thousands of unread

    emails, the whole notification isn't taken over by the number. [CHAR LIMIT=5] -->

    <string name="status_bar_notification_info_overflow">100+</string>



    <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->

    <string name="safeMode">Safe mode</string>

packages/SystemUI/res/layout-xlarge/status_bar_notification_area.xml

+26 −17
Original line number Diff line number Diff line
@@ -25,6 +25,14 @@ 
    android:layout_alignParentRight="true"

    android:orientation="horizontal"

    >



    <LinearLayout

        android:id="@+id/notificationAndImeArea"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        >



        <com.android.systemui.statusbar.tablet.InputMethodButton

            android:id="@+id/imeSwitchButton"

            android:layout_width="wrap_content"
@@ -49,6 +57,7 @@ 
                android:layout_marginLeft="8dp"

                />

        </com.android.systemui.statusbar.tablet.NotificationIconArea>

    </LinearLayout>



    <LinearLayout

        android:id="@+id/notificationTrigger"

packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java

+7 −6
Original line number Diff line number Diff line
@@ -81,11 +81,10 @@ public class NotificationPanel extends LinearLayout implements StatusBarPanel, 


        mContentParent = (ViewGroup)findViewById(R.id.content_parent);

        mTitleArea = findViewById(R.id.title_area);

        mTitleArea.setOnClickListener(this);



        mSettingsButton = (ImageView)findViewById(R.id.settings_button);

        mSettingsButton.setOnClickListener(this);

        mNotificationButton = (ImageView)findViewById(R.id.notification_button);

        mNotificationButton.setOnClickListener(this);



        mNotificationScroller = findViewById(R.id.notification_scroller);

        mNotificationGlow = findViewById(R.id.notification_glow);
@@ -178,12 +177,14 @@ public class NotificationPanel extends LinearLayout implements StatusBarPanel, 
    }



    public void onClick(View v) {

        if (v == mSettingsButton) {

        if (v == mTitleArea) {

            if (mSettingsView == null) {

                switchToSettingsMode();

        } else if (v == mNotificationButton) {

            } else {

                switchToNotificationMode();

            }

        }

    }



    public void switchToSettingsMode() {

        removeSettingsView();