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

Commit df1b7c69 authored by Lifu Tang's avatar Lifu Tang
Browse files

Remove tabs from recent location access page 

Bug: 185382276
Test: manual - screenshot/Az2obQLjdy7vVv9
Change-Id: Ic2f3004d57108e136c622290e8d78bf284a09258
parent 8f8e00a7

src/com/android/settings/dashboard/profileselector/ProfileFragmentBridge.java

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import com.android.settings.accounts.AccountDashboardFragment; 
import com.android.settings.applications.manageapplications.ManageApplications;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.location.LocationServices;

import com.android.settings.location.RecentLocationAccessSeeAllFragment;



import java.util.Map;
@@ -43,8 +42,6 @@ public class ProfileFragmentBridge { 
                ProfileSelectAccountFragment.class.getName());

        FRAGMENT_MAP.put(ManageApplications.class.getName(),

                ProfileSelectManageApplications.class.getName());

        FRAGMENT_MAP.put(RecentLocationAccessSeeAllFragment.class.getName(),

                ProfileSelectRecentLocationAccessFragment.class.getName());

        FRAGMENT_MAP.put(LocationServices.class.getName(),

                ProfileSelectLocationServicesFragment.class.getName());

        FRAGMENT_MAP.put(StorageDashboardFragment.class.getName(),

src/com/android/settings/dashboard/profileselector/ProfileSelectRecentLocationAccessFragment.java

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.dashboard.profileselector;



import android.os.Bundle;



import androidx.fragment.app.Fragment;



import com.android.settings.location.RecentLocationAccessSeeAllFragment;



/**

 * Recent location request page for personal/managed profile.

 */

public class ProfileSelectRecentLocationAccessFragment extends ProfileSelectFragment {



    @Override

    public Fragment[] getFragments() {

        final Bundle workOnly = new Bundle();

        workOnly.putInt(EXTRA_PROFILE, ProfileType.WORK);

        final Fragment workFragment = new RecentLocationAccessSeeAllFragment();

        workFragment.setArguments(workOnly);



        final Bundle personalOnly = new Bundle();

        personalOnly.putInt(EXTRA_PROFILE, ProfileType.PERSONAL);

        final Fragment personalFragment = new RecentLocationAccessSeeAllFragment();

        personalFragment.setArguments(personalOnly);

        return new Fragment[]{

                personalFragment, //0

                workFragment

        };

    }

}

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

+0 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.view.MenuItem; 
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.profileselector.ProfileSelectFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.search.SearchIndexable;
@@ -52,13 +51,8 @@ public class RecentLocationAccessSeeAllFragment extends DashboardFragment { 
    @Override

    public void onAttach(Context context) {

        super.onAttach(context);

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



        mController = use(RecentLocationAccessSeeAllPreferenceController.class);

        mController.init(this);

        if (profileType != 0) {

            mController.setProfileType(profileType);

        }

    }



    @Override

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

+2 −11
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ public class RecentLocationAccessSeeAllPreferenceController 
    private final RecentAppOpsAccess mRecentLocationAccesses;

    private boolean mShowSystem = false;

    private Preference mPreference;

    private int mType = ProfileSelectFragment.ProfileType.ALL;



    public RecentLocationAccessSeeAllPreferenceController(Context context, String key) {

        super(context, key);
@@ -68,7 +67,8 @@ public class RecentLocationAccessSeeAllPreferenceController 
        final List<RecentAppOpsAccess.Access> recentLocationAccesses = new ArrayList<>();

        for (RecentAppOpsAccess.Access access : mRecentLocationAccesses.getAppListSorted(

                mShowSystem)) {

            if (isRequestMatchesProfileType(userManager, access, mType)) {

            if (isRequestMatchesProfileType(

                    userManager, access, ProfileSelectFragment.ProfileType.ALL)) {

                recentLocationAccesses.add(access);

            }

        }
@@ -89,15 +89,6 @@ public class RecentLocationAccessSeeAllPreferenceController 
        }

    }



    /**

     * Initialize {@link ProfileSelectFragment.ProfileType} of the controller

     *

     * @param type {@link ProfileSelectFragment.ProfileType} of the controller.

     */

    public void setProfileType(@ProfileSelectFragment.ProfileType int type) {

        mType = type;

    }



    /**

     * Set the value of {@link #mShowSystem}.

     */