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

Commit bbdea988 authored by Dan Sandler's avatar Dan Sandler Committed by Android Git Automerger
Browse files

am 8941e12b: am 95ba62f8: Merge "Remove references to nonexistant... 

am 8941e12b: am 95ba62f8: Merge "Remove references to nonexistant @android:string/ellipsis." into mnc-dev

* commit '8941e12b':
  Remove references to nonexistant @android:string/ellipsis.
parents 613cce81 8941e12b

core/res/res/layout/notification_template_material_inbox.xml

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ 
            android:ellipsize="end"

            android:visibility="gone"

            android:layout_weight="1"

            android:text="@android:string/ellipsis"

            android:text="@android:string/notification_inbox_ellipsis"

            />

        <FrameLayout

            android:id="@+id/inbox_end_pad"

core/res/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -4127,4 +4127,8 @@ 
    <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->

    <string name="floating_toolbar_close_overflow_description">Close overflow</string>



    <!-- Ellipsis character to appear in notification templates, e.g.

         notification_template_material_inbox.xml.

         DO NOT TRANSLATE -->

    <string name="notification_inbox_ellipsis">\u2026</string>

</resources>

core/res/res/values/symbols.xml

+1 −2
Original line number Diff line number Diff line
@@ -443,8 +443,6 @@ 
  <java-symbol type="string" name="app_running_notification_text" />

  <java-symbol type="string" name="delete" />

  <java-symbol type="string" name="deleteText" />

  <java-symbol type="string" name="ellipsis_two_dots" />

  <java-symbol type="string" name="ellipsis" />

  <java-symbol type="string" name="grant_permissions_header_text" />

  <java-symbol type="string" name="list_delimeter" />

  <java-symbol type="string" name="menu_delete_shortcut_label" />
@@ -2278,4 +2276,5 @@ 
  <java-symbol type="bool" name="config_supportDoubleTapWake" />

  <java-symbol type="drawable" name="ic_perm_device_info" />

  <java-symbol type="string" name="config_radio_access_family" />

  <java-symbol type="string" name="notification_inbox_ellipsis" />

</resources>