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

Commit 0cfa67f8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Hide "recent access" and "see all" when location off" into sc-dev

parents 3eecb321 9e0f9b1d

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -4041,7 +4041,7 @@ 
            apps have access to location</item>

    </plurals>

    <!-- [CHAR LIMIT=50] Location settings screen, sub category for recent location access -->

    <string name="location_category_recent_location_access">Past 24 hour access</string>

    <string name="location_category_recent_location_access">Recent access</string>

    <!-- Location settings screen, displayed when there're more than three recent location access apps [CHAR LIMIT=30] -->

    <string name="location_recent_location_access_see_all">See all</string>

    <!-- [CHAR LIMIT=30] Location settings screen, button to bring the user to view the details of recent location access -->

res/xml/location_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
        android:title="@string/location_recent_location_access_see_all"

        android:icon="@drawable/ic_chevron_right_24dp"

        android:fragment="com.android.settings.location.RecentLocationAccessSeeAllFragment"

        settings:controller="com.android.settings.location.RecentLocationAccessSeeAllButtonPreferenceController"

        settings:searchable="false"/>



    <PreferenceCategory

res/xml/location_settings_personal.xml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
        android:title="@string/location_recent_location_access_see_all"

        android:icon="@drawable/ic_chevron_right_24dp"

        android:fragment="com.android.settings.location.RecentLocationAccessSeeAllFragment"

        settings:controller="com.android.settings.location.RecentLocationAccessSeeAllButtonPreferenceController"

        settings:searchable="false"/>



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

res/xml/location_settings_workprofile.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        android:title="@string/location_recent_location_access_see_all"

        android:icon="@drawable/ic_chevron_right_24dp"

        android:fragment="com.android.settings.location.RecentLocationAccessSeeAllFragment"

        settings:controller="com.android.settings.core.WorkPreferenceController"

        settings:controller="com.android.settings.location.RecentLocationAccessSeeAllButtonPreferenceController"

        settings:forWork="true"

        settings:searchable="false"/>

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

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ public class LocationPersonalSettings extends DashboardFragment { 
        // STOPSHIP(b/180533061): resolve the personal/work location services issue before we can

        // ship.

        use(LocationFooterPreferenceController.class).init(this);

        use(RecentLocationAccessSeeAllButtonPreferenceController.class).init(this);



        final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE);

        final RecentLocationAccessPreferenceController controller = use(