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

Commit e4e5b0bd authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android (Google) Code Review
Browse files

Merge "Remove number code from StatusBarIconView" into main

parents 8f36a932 ca93dfd9

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -2456,7 +2456,7 @@ package android { 
    field public static final int config_longAnimTime = 17694722; // 0x10e0002

    field public static final int config_mediumAnimTime = 17694721; // 0x10e0001

    field public static final int config_shortAnimTime = 17694720; // 0x10e0000

    field public static final int status_bar_notification_info_maxnum = 17694723; // 0x10e0003

    field @Deprecated public static final int status_bar_notification_info_maxnum = 17694723; // 0x10e0003

  }















  public static final class R.interpolator {










@@ -2550,7 +2550,7 @@ package android {













    field public static final int search_go = 17039372; // 0x104000c















    field public static final int selectAll = 17039373; // 0x104000d















    field public static final int selectTextMode = 17039382; // 0x1040016













    field public static final int status_bar_notification_info_overflow = 17039383; // 0x1040017













    field @Deprecated public static final int status_bar_notification_info_overflow = 17039383; // 0x1040017















    field public static final int unknownName = 17039374; // 0x104000e















    field public static final int untitled = 17039375; // 0x104000f















    field @Deprecated public static final int yes = 17039379; // 0x1040013

























core/res/res/values/config.xml



+1
−4




























Original line number
Diff line number
Diff line








@@ -2625,10 +2625,7 @@













         If false, not supported. -->















    <bool name="config_duplicate_port_omadm_wappush">false</bool>





























    <!-- Maximum numerical value that will be shown in a status bar













         notification icon or in the notification itself. Will be replaced













         with @string/status_bar_notification_info_overflow when shown in the













         UI. -->













    <!-- @deprecated No longer used. -->















    <integer name="status_bar_notification_info_maxnum">999</integer>































    <!-- Path to an ISO image to be shared with via USB mass storage.

































core/res/res/values/strings.xml



+1
−5




























Original line number
Diff line number
Diff line








@@ -788,11 +788,7 @@













    <!-- label for item that locks the phone and enforces that it can't be unlocked without strong authentication. [CHAR LIMIT=24] -->















    <string name="global_action_lockdown">Lockdown</string>





























    <!-- Text to use when the number in a notification info is too large













         (greater than status_bar_notification_info_maxnum, defined in













         values/config.xml) and must be truncated. May need to be localized













         for most appropriate textual indicator of "more than X".













         [CHAR LIMIT=4] -->













    <!-- @deprecated No longer used. -->















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































    <!-- The divider symbol between different parts of the notification header. not translatable [CHAR LIMIT=1] -->

































packages/SystemUI/res/values/colors.xml



+0
−1




























Original line number
Diff line number
Diff line








@@ -18,7 +18,6 @@













-->















<resources xmlns:android="http://schemas.android.com/apk/res/android"















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













    <drawable name="notification_number_text_color">#ffffffff</drawable>















    <drawable name="system_bar_background">@color/system_bar_background_opaque</drawable>















    <color name="system_bar_background_opaque">#ff000000</color>















    <color name="system_bar_background_transparent">#00000000</color>

































packages/SystemUI/res/values/config.xml



+0
−3




























Original line number
Diff line number
Diff line








@@ -25,9 +25,6 @@













     (package/class)  -->















    <string name="config_recentsComponent" translatable="false">com.android.systemui.recents.OverviewProxyRecentsImpl</string>





























    <!-- Whether or not we show the number in the bar. -->













    <bool name="config_statusBarShowNumber">false</bool>





























    <!-- For how long the lock screen can be on before the display turns off. -->















    <integer name="config_lockScreenDisplayTimeout">10000</integer>