Merge "Fix footer issues" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
7ca749e3a5
@@ -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>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
Reference in New Issue
Block a user