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

Commit 7b4b98b5 authored by Xinyi Zhou's avatar Xinyi Zhou Committed by Android (Google) Code Review
Browse files

Merge "Add Fast Pair saved devices settings page component name to config"

parents f95a1133 393ba5ce

core/java/android/provider/Settings.java

+9 −0
Original line number Diff line number Diff line
@@ -10297,6 +10297,15 @@ public final class Settings { 
         */

        public static final String NEARBY_SHARING_SLICE_URI = "nearby_sharing_slice_uri";













        /**













         * Current provider of Fast Pair saved devices page.













         * Default value in @string/config_defaultNearbyFastPairSettingsDevicesComponent.













         * No VALIDATOR as this setting will not be backed up.













         * @hide













         */













        public static final String NEARBY_FAST_PAIR_SETTINGS_DEVICES_COMPONENT =













                "nearby_fast_pair_settings_devices_component";



























        /**















         * Controls whether aware is enabled.















         * @hide

































core/res/res/values/config.xml



+4
−0




























Original line number
Diff line number
Diff line








@@ -4978,6 +4978,10 @@













    <!-- URI used for Nearby Share SliceProvider scanning. -->















    <string translatable="false" name="config_defaultNearbySharingSliceUri"></string>





























    <!-- Component name that accepts settings intents for saved devices.













             Used by FastPairSettingsFragment. -->













    <string translatable="false" name="config_defaultNearbyFastPairSettingsDevicesComponent"></string>





























    <!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing















         check after reboot or airplane mode toggling -->















    <bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">false</bool>

































core/res/res/values/symbols.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -4100,6 +4100,7 @@













  <java-symbol type="layout" name="chooser_action_button" />















  <java-symbol type="dimen" name="chooser_action_button_icon_size" />















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













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















  <java-symbol type="bool" name="config_disable_all_cb_messages" />















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