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

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

Merge "Remove "See all" button" into sc-dev

parents 16f3036c 1170a08d

res/xml/location_settings.xml

+0 −8
Original line number Diff line number Diff line
@@ -27,14 +27,6 @@ 
        settings:controller=

            "com.android.settings.location.RecentLocationAccessPreferenceController"/>



    <Preference

        android:key="recent_location_access_see_all_button"

        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

        android:key="location_advanced_settings"

        android:layout="@layout/preference_category_no_label"

res/xml/location_settings_personal.xml

+0 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ 
        settings:controller=

            "com.android.settings.location.RecentLocationAccessPreferenceController"/>



    <Preference

        android:key="recent_location_access_see_all_button"

        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 -->

    <Preference

        android:key="app_level_permissions"

res/xml/location_settings_workprofile.xml

+0 −9
Original line number Diff line number Diff line
@@ -28,15 +28,6 @@ 
        settings:controller=

            "com.android.settings.location.RecentLocationAccessPreferenceController"/>



    <Preference

        android:key="recent_location_access_see_all_button"

        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:forWork="true"

        settings:searchable="false"/>



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="managed_profile_location_switch"

        android:title="@string/managed_profile_location_switch_title"

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

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ public class LocationPersonalSettings extends DashboardFragment { 


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

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

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



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

        final RecentLocationAccessPreferenceController controller = use(

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

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ public class LocationSettings extends DashboardFragment { 


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

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

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

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

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

    }