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

Commit af0d38fb authored by chelseahao's avatar chelseahao
Browse files

[Audiosharing] Created audiostreams package. 

Also updated some resource names.

Bug: 308368124
Test: Manual
Change-Id: I775e640bb34a02ee104cefd9a396af6a9f2fbb6e
parent 74b9b9db

res/values/strings.xml

+6 −4
Original line number Diff line number Diff line
@@ -296,13 +296,15 @@ 
    <string name="calls_and_alarms_device_title">Calls and alarms</string>









    <!-- Title for audio streams preference category [CHAR LIMIT=none]-->









    <string name="audio_sharing_streams_category_title">Connect to a LE audio stream</string>









    <string name="audio_streams_category_title">Connect to a LE audio stream</string>









    <!-- Title for audio streams preference [CHAR LIMIT=none]-->









    <string name="audio_sharing_streams_pref_title">Nearby audio streams</string>









    <string name="audio_streams_pref_title">Nearby audio streams</string>









    <!-- Title for audio streams page [CHAR LIMIT=none]-->









    <string name="audio_sharing_streams_title">Audio streams</string>









    <string name="audio_streams_title">Audio streams</string>









    <!-- Summary for QR code scanning in audio streams page [CHAR LIMIT=none]-->









    <string name="audio_sharing_streams_qr_code_summary">Connect to an audio stream using QR code</string>









    <string name="audio_streams_qr_code_summary">Connect to an audio stream using QR code</string>









    <!--Text that appears when scanning for nearby audio streams is finished and no streams were found [CHAR LIMIT=40]-->









    <string name="audio_streams_empty">No nearby audio streams were found.</string>

















    <!-- Date & time settings screen title -->









    <string name="date_and_time">Date &amp; time</string>
































res/xml/bluetooth_audio_sharing.xml



+4
−4






























Original line number
Diff line number
Diff line







@@ -34,13 +34,13 @@

















    <PreferenceCategory









        android:key="audio_streams_settings_category"









        android:title="@string/audio_sharing_streams_category_title"









        settings:controller="com.android.settings.connecteddevice.audiosharing.AudioStreamsCategoryController" >









        android:title="@string/audio_streams_category_title"









        settings:controller="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsCategoryController">



















        <Preference









            android:key="audio_streams_settings"









            android:fragment="com.android.settings.connecteddevice.audiosharing.AudioStreamsDashboardFragment"









            android:title="@string/audio_sharing_streams_pref_title"









            android:fragment="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsDashboardFragment"









            android:title="@string/audio_streams_pref_title"









            android:icon="@drawable/ic_chevron_right_24dp" />



















    </PreferenceCategory>
































res/xml/bluetooth_audio_streams.xml



+3
−2






























Original line number
Diff line number
Diff line







@@ -17,12 +17,13 @@

















<PreferenceScreen









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









    android:title="@string/audio_sharing_streams_title">









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:title="@string/audio_streams_title">



















    <Preference









        android:key="audio_streams_scan_qr_code"









        android:title="@string/bluetooth_find_broadcast_button_scan"









        android:icon="@drawable/ic_add_24dp"









        android:summary="@string/audio_sharing_streams_qr_code_summary"/>









        android:summary="@string/audio_streams_qr_code_summary" />



















</PreferenceScreen>








 No newline at end of file
























src/com/android/settings/connecteddevice/audiosharing/AudioSharingNamePreference.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -24,6 +24,7 @@ import android.widget.ImageButton;







import androidx.preference.PreferenceViewHolder;



















import com.android.settings.R;









import com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsQrCodeFragment;









import com.android.settings.core.SubSettingLauncher;









import com.android.settings.widget.ValidatedEditTextPreference;










































src/com/android/settings/connecteddevice/audiosharing/AudioStreamsCategoryController.java→src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsCategoryController.java



+4
−2






























Original line number
Diff line number
Diff line







@@ -14,7 +14,7 @@







 * limitations under the License.









 */



















package com.android.settings.connecteddevice.audiosharing;









package com.android.settings.connecteddevice.audiosharing.audiostreams;



















import android.content.Context;


















@@ -29,6 +29,8 @@ public class AudioStreamsCategoryController extends PreferenceCategoryController

















    @Override









    public int getAvailabilityStatus() {









        return Flags.enableLeAudioQrCodePrivateBroadcastSharing() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;









        return Flags.enableLeAudioQrCodePrivateBroadcastSharing()









                ? AVAILABLE









                : UNSUPPORTED_ON_DEVICE;









    }









}