From be120eca3ea0b1c35dfac43c34c2aec0856d0dc5 Mon Sep 17 00:00:00 2001 From: David Gutierrez Date: Thu, 1 Dec 2022 18:08:11 -0600 Subject: [PATCH] Dead code removal Test: on-device testing Change-Id: I96e7e4d5306d468dd32a9affad28bd8c3f90bb75 --- ...leSelectRecentLocationRequestFragment.java | 52 --------- .../RecentLocationRequestSeeAllFragment.java | 100 ------------------ .../exempt_not_implementing_index_provider | 1 - 3 files changed, 153 deletions(-) delete mode 100644 src/com/android/settings/dashboard/profileselector/ProfileSelectRecentLocationRequestFragment.java delete mode 100644 src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectRecentLocationRequestFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectRecentLocationRequestFragment.java deleted file mode 100644 index 16cb43cc432..00000000000 --- a/src/com/android/settings/dashboard/profileselector/ProfileSelectRecentLocationRequestFragment.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2019 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.R; -import com.android.settings.location.RecentLocationRequestSeeAllFragment; - -/** - * Recent location request page for personal/managed profile. - */ -public class ProfileSelectRecentLocationRequestFragment extends ProfileSelectFragment { - - @Override - public Fragment[] getFragments() { - final Bundle workOnly = new Bundle(); - workOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.WORK); - final Fragment workFragment = new RecentLocationRequestSeeAllFragment(); - workFragment.setArguments(workOnly); - - final Bundle personalOnly = new Bundle(); - personalOnly.putInt(EXTRA_PROFILE, ProfileSelectFragment.ProfileType.PERSONAL); - final Fragment personalFragment = new RecentLocationRequestSeeAllFragment(); - personalFragment.setArguments(personalOnly); - return new Fragment[]{ - personalFragment, //0 - workFragment - }; - } - - @Override - protected int getPreferenceScreenResId() { - return R.xml.location_recent_requests_header; - } -} diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java deleted file mode 100644 index 7fd66435c7a..00000000000 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright 2018 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.location; - -import android.content.Context; -import android.view.Menu; -import android.view.MenuInflater; -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; - -/** @deprecated Use {@link RecentLocationAccessSeeAllFragment} instead. */ -@Deprecated -public class RecentLocationRequestSeeAllFragment extends DashboardFragment { - private static final String TAG = "RecentLocationReqAll"; - public static final String PATH = - "com.android.settings.location.RecentLocationRequestSeeAllFragment"; - - private static final int MENU_SHOW_SYSTEM = Menu.FIRST + 1; - private static final int MENU_HIDE_SYSTEM = Menu.FIRST + 2; - - private boolean mShowSystem = false; - private MenuItem mShowSystemMenu; - private MenuItem mHideSystemMenu; - private RecentLocationRequestSeeAllPreferenceController mController; - - @Override - public int getMetricsCategory() { - return MetricsEvent.RECENT_LOCATION_REQUESTS_ALL; - } - - @Override - public void onAttach(Context context) { - super.onAttach(context); - final int profileType = getArguments().getInt(ProfileSelectFragment.EXTRA_PROFILE); - - mController = use(RecentLocationRequestSeeAllPreferenceController.class); - mController.init(this); - if (profileType != 0) { - mController.setProfileType(profileType); - } - } - - @Override - protected int getPreferenceScreenResId() { - return R.xml.location_recent_requests_see_all; - } - - @Override - protected String getLogTag() { - return TAG; - } - - @Override - public boolean onOptionsItemSelected(MenuItem menuItem) { - switch (menuItem.getItemId()) { - case MENU_SHOW_SYSTEM: - case MENU_HIDE_SYSTEM: - mShowSystem = menuItem.getItemId() == MENU_SHOW_SYSTEM; - updateMenu(); - if (mController != null) { - mController.setShowSystem(mShowSystem); - } - return true; - default: - return super.onOptionsItemSelected(menuItem); - } - } - - private void updateMenu() { - mShowSystemMenu.setVisible(!mShowSystem); - mHideSystemMenu.setVisible(mShowSystem); - } - - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - super.onCreateOptionsMenu(menu, inflater); - mShowSystemMenu = menu.add(Menu.NONE, MENU_SHOW_SYSTEM, Menu.NONE, - R.string.menu_show_system); - mHideSystemMenu = menu.add(Menu.NONE, MENU_HIDE_SYSTEM, Menu.NONE, - R.string.menu_hide_system); - updateMenu(); - } -} diff --git a/tests/robotests/assets/exempt_not_implementing_index_provider b/tests/robotests/assets/exempt_not_implementing_index_provider index 6a1a1ffbbc5..7099089fb6a 100644 --- a/tests/robotests/assets/exempt_not_implementing_index_provider +++ b/tests/robotests/assets/exempt_not_implementing_index_provider @@ -92,4 +92,3 @@ com.android.settings.wifi.WifiInfo com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessDetails com.android.settings.wifi.details2.WifiNetworkDetailsFragment2 com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2 -com.android.settings.dashboard.profileselector.ProfileSelectRecentLocationRequestFragment