PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix footer issues" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-24 16:15:36 +00:00
committed by Android (Google) Code Review
parent 648f773c7c 791b6fadc7
commit 7ca749e3a5
5 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/values/strings.xml
View File

@@ -685,24 +685,24 @@
<!-- Location settings, loading the number of apps which have location permission [CHAR LIMIT=30] -->
<string name="location_settings_loading_app_permission_stats">Loading\u2026</string>
<!-- Location settings footer warning text when location is on [CHAR LIMIT=NONE] -->
<string name="location_settings_footer_location_on">
&lt;br>&lt;br>Apps with the Nearby devices permission can determine the
<string name="location_settings_footer_general">
Apps with the Nearby devices permission can determine the
relative position of connected devices.
&lt;br>&lt;br>&lt;a href="<xliff:g example="http://www.google.com" id="url">
https://support.google.com/android/answer/3467281</xliff:g>">Learn more&lt;/a>
</string>
<!-- Location settings footer warning text when location is off [CHAR LIMIT=NONE] -->
<string name="location_settings_footer_location_off">
Location access is off for apps and services. Your device location may still be sent to
emergency responders when you call or text an emergency number.
&lt;br>&lt;br>Apps with the Nearby devices permission can determine the relative
position of connected devices.
&lt;br>&lt;br>&lt;a href="<xliff:g example="http://www.google.com"
</string>
<!-- Location settings footer link to support page [CHAR LIMIT=NONE] -->
<string name="location_settings_footer_learn_more">
&lt;a href="<xliff:g example="http://www.google.com"
id="url"> https://support.google.com/android/answer/3467281</xliff:g>">Learn more&lt;/a>
</string>
<!-- Location settings footer link content description [CHAR LIMIT=NONE] -->
<string name="location_settings_footer_learn_more_content_description">
Learn more about Location Settings.
</string>
<!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
<string name="account_settings_title">Accounts</string>

3
res/xml/location_settings.xml
View File

@@ -70,8 +70,9 @@
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference
android:title="@string/location_settings_footer_location_on"
android:title="@string/location_settings_footer_general"
android:key="location_footer"
android:selectable="false"
settings:searchable="false"
settings:controller="com.android.settings.location.LocationSettingsFooterPreferenceController"/>
</PreferenceScreen>

2
res/xml/location_settings_personal.xml
View File

@@ -54,7 +54,7 @@
settings:controller="com.android.settings.location.LocationServicesPreferenceController"/>
<com.android.settingslib.widget.FooterPreference
android:title="@string/location_settings_footer_location_on"
android:title="@string/location_settings_footer_general"
android:key="location_footer"
settings:controller="com.android.settings.location.LocationSettingsFooterPreferenceController"
android:selectable="false"/>

2
res/xml/location_settings_workprofile.xml
View File

@@ -62,7 +62,7 @@
settings:controller="com.android.settings.location.LocationServicesForWorkPreferenceController"/>
<com.android.settingslib.widget.FooterPreference
android:title="@string/location_settings_footer_location_on"
android:title="@string/location_settings_footer_general"
android:key="location_footer"
settings:controller="com.android.settings.location.LocationSettingsFooterPreferenceController"
android:selectable="false"/>