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

Commit 56fa32bc authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev 

* commit '23fa0320':
  Add a notification icon when connected to wireless display.
parents 441f0672 23fa0320

core/res/res/drawable-hdpi/ic_notify_wifidisplay.png

0 → 100644
+941 B
Loading image diff...

core/res/res/drawable-mdpi/ic_notify_wifidisplay.png

0 → 100644
+721 B
Loading image diff...

core/res/res/drawable-xhdpi/ic_notify_wifidisplay.png

0 → 100644
+1.07 KiB
Loading image diff...

core/res/res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -3821,6 +3821,13 @@ 
    <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->

    <string name="display_manager_overlay_display_title"><xliff:g id="name">%1$s</xliff:g>: <xliff:g id="width">%2$d</xliff:g>x<xliff:g id="height">%3$d</xliff:g>, <xliff:g id="dpi">%4$d</xliff:g> dpi</string>



    <!-- Title of the notification to indicate an active wifi display connection.  [CHAR LIMIT=50] -->

    <string name="wifi_display_notification_title">Wireless display is connected</string>

    <!-- Message of the notification to indicate an active wifi display connection.  [CHAR LIMIT=80] -->

    <string name="wifi_display_notification_message">This screen is showing on another device</string>

    <!-- Label of a button to disconnect an active wifi display connection.  [CHAR LIMIT=25] -->

    <string name="wifi_display_notification_disconnect">Disconnect</string>



    <!-- Keyguard strings -->

    <!-- Label shown on emergency call button in keyguard -->

    <string name="kg_emergency_call_label">Emergency call</string>

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -1486,6 +1486,7 @@ 
  <java-symbol type="bool" name="show_ongoing_ime_switcher" />

  <java-symbol type="color" name="config_defaultNotificationColor" />

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

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

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

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

  <java-symbol type="drawable" name="stat_notify_disk_full" />
@@ -1621,6 +1622,9 @@ 
  <java-symbol type="string" name="vpn_lockdown_error" />

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

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

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

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

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

  <java-symbol type="style" name="Theme.Dialog.AppError" />

  <java-symbol type="style" name="Theme.Toast" />

  <java-symbol type="xml" name="storage_list" />