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

Commit 33055177 authored by Maggie Wang's avatar Maggie Wang Committed by Android (Google) Code Review
Browse files

Merge "Set initialExpandedChildrenCount dynamically in location settings"

parents 1e36bde7 3220c46b

res/xml/location_settings.xml

+15 −16
Original line number Diff line number Diff line
@@ -20,19 +20,9 @@ 
        android:title="@string/location_settings_title"

        settings:keywords="@string/keywords_location">



        <Preference

            android:key="location_mode"

            android:title="@string/location_mode_title"

            settings:keywords="@string/keywords_location_mode"

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



        <!-- This preference category gets removed if there is no managed profile -->

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="managed_profile_location_switch"

            android:title="@string/managed_profile_location_switch_title"

            settings:useAdminDisabledSummary="true"

            android:enabled="false"

            android:selectable="true" />

        <PreferenceCategory

            android:key="recent_location_requests"

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



        <!-- This preference category gets removed if new_recent_location_ui is disabled -->

        <Preference
@@ -49,12 +39,21 @@ 
            android:title="@string/location_scanning_screen_title"

            android:fragment="com.android.settings.location.ScanningSettings"/>



        <PreferenceCategory

            android:key="recent_location_requests"

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

        <!-- This preference category gets removed if there is no managed profile -->

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="managed_profile_location_switch"

            android:title="@string/managed_profile_location_switch_title"

            settings:useAdminDisabledSummary="true"

            android:enabled="false"

            android:selectable="true" />



        <PreferenceCategory

            android:key="location_services"

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



        <Preference

            android:key="location_mode"

            android:title="@string/location_mode_title"

            settings:keywords="@string/keywords_location_mode"

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

</PreferenceScreen>

src/com/android/settings/location/LocationSettings.java

+10 −0
Original line number Diff line number Diff line
@@ -72,6 +72,16 @@ public class LocationSettings extends DashboardFragment { 


    private LocationSwitchBarController mSwitchBarController;



    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        final RecentLocationApps recentLocationApps = new RecentLocationApps(getActivity());

        int locationRequestsApps = recentLocationApps.getAppList().size();

        int locationRequestsPrefs = locationRequestsApps == 0 ? 1 : locationRequestsApps;

        getPreferenceScreen().setInitialExpandedChildrenCount(locationRequestsPrefs + 2);

    }





    @Override

    public int getMetricsCategory() {

        return MetricsEvent.LOCATION;