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

Commit 92fee9f5 authored by Chelsea Hao's avatar Chelsea Hao Committed by Android (Google) Code Review
Browse files

Merge changes Icfeafa14,I775e640b,I8d0d8150 into main 

* changes:
  [Audiosharing] Create progressCategory to show stream.
  [Audiosharing] Created audiostreams package.
  [Audiosharing] Branch existing LE QrCode scanner.
parents 3efd326d eef358eb

AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -4942,6 +4942,16 @@ 
            </intent-filter>

        </activity>



        <activity

            android:name="com.android.settings.connecteddevice.audiosharing.audiostreams.qrcode.QrCodeScanModeActivity"

            android:permission="android.permission.BLUETOOTH_CONNECT"

            android:exported="false">

            <intent-filter>

                <action android:name="android.settings.BLUETOOTH_LE_AUDIO_QR_CODE_SCANNER"/>

                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>



        <activity

            android:name=".spa.SpaActivity"

            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"

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



+7
−2






























Original line number
Diff line number
Diff line







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

















<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" />



















    <com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamsProgressCategoryPreference









        android:key="audio_streams_nearby_category"









        android:title="@string/audio_streams_pref_title" />



















</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;