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

Commit 61a3cfa6 authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-fd70e1c6a633413aaa63fb8d8091e2b6" 

* changes:
  [automerge] [LeAudio] Add new string and an icon for the broadcast swtich dialog 2p: 4a838399 2p: df84dc4d
  [automerge] [LeAudio] Add new string and an icon for the broadcast swtich dialog 2p: 4a838399
  [LeAudio] Add new string and an icon for the broadcast swtich dialog
parents e7073214 c1010ce1

packages/SettingsLib/res/drawable/settings_input_antenna.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2022 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->



<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp"

        android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"

        android:tint="?attr/colorControlNormal">

    <path android:fillColor="@android:color/white"

          android:pathData="M9,22.4 L7.6,21 11,17.6V14.3Q10.325,14 9.913,13.375Q9.5,12.75 9.5,12Q9.5,10.95 10.225,10.225Q10.95,9.5 12,9.5Q13.05,9.5 13.775,10.225Q14.5,10.95 14.5,12Q14.5,12.75 14.088,13.375Q13.675,14 13,14.3V17.6L16.4,21L15,22.4L12,19.4ZM5,12Q5,9.05 7.05,7.025Q9.1,5 12,5Q14.9,5 16.95,7.025Q19,9.05 19,12H17Q17,9.925 15.538,8.462Q14.075,7 12,7Q9.925,7 8.463,8.462Q7,9.925 7,12ZM1,12Q1,9.7 1.863,7.7Q2.725,5.7 4.225,4.212Q5.725,2.725 7.725,1.862Q9.725,1 12,1Q14.275,1 16.275,1.862Q18.275,2.725 19.775,4.212Q21.275,5.7 22.138,7.7Q23,9.7 23,12H21Q21,10.125 20.288,8.487Q19.575,6.85 18.35,5.625Q17.125,4.4 15.488,3.7Q13.85,3 12,3Q10.15,3 8.512,3.7Q6.875,4.4 5.65,5.625Q4.425,6.85 3.712,8.487Q3,10.125 3,12Z"/>

</vector>
 
 No newline at end of file

packages/SettingsLib/res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -1627,4 +1627,13 @@ 
    <string name="bt_le_audio_scan_qr_code_scanner">To start listening, center the QR code below</string>

    <!-- [CHAR LIMIT=NONE] Hint for QR code process failure -->

    <string name="bt_le_audio_qr_code_is_not_valid_format">QR code isn\u0027t a valid format</string>



    <!-- [CHAR LIMIT=NONE] Le audio broadcast dialog, title -->

    <string name="bt_le_audio_broadcast_dialog_title">Stop broadcasting <xliff:g id="app_name" example="App Name 1">%1$s</xliff:g>?</string>

    <!-- [CHAR LIMIT=NONE] Le audio broadcast dialog, sub-title -->

    <string name="bt_le_audio_broadcast_dialog_sub_title">If you broadcast <xliff:g id="switchApp" example="App Name 2">%1$s</xliff:g> or change the output, your current broadcast will stop</string>

    <!-- [CHAR LIMIT=NONE] Le audio broadcast dialog, switch to others app. -->

    <string name="bt_le_audio_broadcast_dialog_switch_app">Broadcast <xliff:g id="switchApp" example="App Name 2">%1$s</xliff:g></string>

    <!-- [CHAR LIMIT=NONE] Le audio broadcast dialog, different output. -->

    <string name="bt_le_audio_broadcast_dialog_different_output">Change output</string>

</resources>