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

Commit 9e0f9b1d authored by Yu-Han Yang's avatar Yu-Han Yang
Browse files

Hide "recent access" and "see all" when location off 

This CL also does the following:
- Change "past 24 hour access" to "recent access"
- Add timestamp to recent access app
- Remove the summary of "Location Services" button

Bug: 180533061
Test: on device
Change-Id: I0405cb6f363243db9f2c9ccf8ab8788b633d1564
parent d8df0d97

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -4035,7 +4035,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(