diff --git a/res/values/strings.xml b/res/values/strings.xml index 191b34d4089..bed96d80816 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7359,8 +7359,6 @@ android security patch level, baseband version, kernel version theme, light, dark, mode - - financial app, sms, permission dark theme @@ -9408,10 +9406,6 @@ %1$d of %2$d apps allowed to modify system settings - - Financial Apps Sms Access - - financial_sms_root_screen_key Can install other apps @@ -10087,7 +10081,7 @@ System UI demo mode - Dark Theme + Dark theme On / Temporarily disabled due to Battery Saver diff --git a/res/xml/financial_app_sms_access.xml b/res/xml/financial_app_sms_access.xml deleted file mode 100644 index 6f7ba50dd4e..00000000000 --- a/res/xml/financial_app_sms_access.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml index e8265b2544a..f8462983418 100644 --- a/res/xml/special_access.xml +++ b/res/xml/special_access.xml @@ -145,12 +145,6 @@ android:value="com.android.settings.Settings$ChangeWifiStateActivity" /> - - installedPackages = - packageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS); - final int numPackages = installedPackages.size(); - for (int i = 0; i < numPackages; i++) { - final PackageInfo installedPackage = installedPackages.get(i); - - if (installedPackage.requestedPermissions == null) { - continue; - } - final int targetSdk = installedPackage.applicationInfo.targetSdkVersion; - final String pkgName = installedPackage.packageName; - - if ((targetSdk >= Build.VERSION_CODES.Q - && ArrayUtils.contains(installedPackage.requestedPermissions, - SMS_FINANCIAL_TRANSACTIONS)) - || (targetSdk < Build.VERSION_CODES.Q - && ArrayUtils.contains(installedPackage.requestedPermissions, - READ_SMS))) { - final SwitchPreference pref = new SwitchPreference(mRoot.getContext()); - pref.setTitle(installedPackage.applicationInfo.loadLabel(packageManager)); - pref.setKey(pkgName); - - pref.setChecked( - appOpsManager.checkOp( - targetSdk >= Build.VERSION_CODES.Q - ? AppOpsManager.OP_SMS_FINANCIAL_TRANSACTIONS - : AppOpsManager.OP_READ_SMS, - installedPackage.applicationInfo.uid, - pkgName) == AppOpsManager.MODE_ALLOWED); - - pref.setOnPreferenceChangeListener((preference, newValue) -> { - final int uid; - try { - uid = packageManager.getPackageInfo(preference.getKey(), 0) - .applicationInfo.uid; - } catch (NameNotFoundException e) { - Log.e(TAG, "onPreferenceChange: Failed to get uid for " - + preference.getKey()); - return false; - } - - appOpsManager.setMode( - targetSdk >= Build.VERSION_CODES.Q - ? AppOpsManager.OP_SMS_FINANCIAL_TRANSACTIONS - : AppOpsManager.OP_READ_SMS, - uid, - pkgName, - (Boolean) newValue ? AppOpsManager.MODE_ALLOWED - : AppOpsManager.MODE_IGNORED); - return true; - }); - mRoot.addPreference(pref); - } - } - } - - @Override - public void onRunningStateChanged(boolean running) {} - - @Override - public void onPackageListChanged() { - updateList(); - } - - @Override - public void onRebuildComplete(ArrayList apps) {} - - @Override - public void onPackageIconChanged() {} - - @Override - public void onPackageSizeChanged(String packageName) {} - - @Override - public void onAllSizesComputed() {} - - @Override - public void onLauncherInfoChanged() {} - - @Override - public void onLoadEntriesCompleted() {} -} diff --git a/src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsSmsAccess.java b/src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsSmsAccess.java deleted file mode 100644 index 92f4e287bfd..00000000000 --- a/src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsSmsAccess.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 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.applications.specialaccess.financialapps; - -import android.app.settings.SettingsEnums; -import android.content.Context; -import android.provider.SearchIndexableResource; - -import com.android.settings.R; -import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settingslib.search.SearchIndexable; - -import java.util.ArrayList; -import java.util.List; - -@SearchIndexable -public class FinancialAppsSmsAccess extends DashboardFragment { - private final static String TAG = FinancialAppsSmsAccess.class.getSimpleName(); - - @Override - protected String getLogTag() { - return TAG; - } - - @Override - protected int getPreferenceScreenResId() { - return R.xml.financial_app_sms_access; - } - - @Override - public int getMetricsCategory() { - return SettingsEnums.SETTINGS_FINANCIAL_APPS_SMS_ACCESS; - } - - public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - @Override - public List getXmlResourcesToIndex(Context context, - boolean enabled) { - final ArrayList result = new ArrayList<>(); - - final SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.financial_app_sms_access; - result.add(sir); - return result; - } - }; -} diff --git a/src/com/android/settings/gestures/GestureNavigationBackSensitivityDialog.java b/src/com/android/settings/gestures/GestureNavigationBackSensitivityDialog.java index 164705bfe65..e4f25ebb37e 100644 --- a/src/com/android/settings/gestures/GestureNavigationBackSensitivityDialog.java +++ b/src/com/android/settings/gestures/GestureNavigationBackSensitivityDialog.java @@ -52,8 +52,7 @@ public class GestureNavigationBackSensitivityDialog extends InstrumentedDialogFr @Override public int getMetricsCategory() { - // TODO(135211145): Use a separate metrics category for this dialog. - return SettingsEnums.SETTINGS_GESTURE_SWIPE_UP; + return SettingsEnums.SETTINGS_GESTURE_NAV_BACK_SENSITIVITY_DLG; } @Override diff --git a/src/com/android/settings/gestures/GestureNavigationNotAvailableDialog.java b/src/com/android/settings/gestures/GestureNavigationNotAvailableDialog.java index e69db274011..6e8b4142d8b 100644 --- a/src/com/android/settings/gestures/GestureNavigationNotAvailableDialog.java +++ b/src/com/android/settings/gestures/GestureNavigationNotAvailableDialog.java @@ -44,8 +44,7 @@ public class GestureNavigationNotAvailableDialog extends InstrumentedDialogFragm @Override public int getMetricsCategory() { - // TODO(135211145): Use a separate metrics category for this dialog. - return SettingsEnums.SETTINGS_GESTURE_SWIPE_UP; + return SettingsEnums.SETTINGS_GESTURE_NAV_NOT_AVAILABLE_DLG; } @Override diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsControllerTest.java deleted file mode 100644 index 39a05cb012a..00000000000 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/financialapps/FinancialAppsControllerTest.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.android.settings.applications.specialaccess.financialapps; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - -import static android.Manifest.permission.SMS_FINANCIAL_TRANSACTIONS; -import static android.Manifest.permission.READ_SMS; - -import android.app.AppOpsManager; -import android.content.Context; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; -import android.content.pm.PackageManager; -import android.os.Build; - -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; -import org.robolectric.shadow.api.Shadow; - -import java.util.ArrayList; -import java.util.Arrays; - -@RunWith(RobolectricTestRunner.class) -public class FinancialAppsControllerTest { - @Mock - private PackageManager mPackageManager; - @Mock - private AppOpsManager mAppOpsManager; - @Mock - private PreferenceScreen mRoot; - @Mock - private Preference mPreference; - - private Context mContext; - private PackageInfo mPackageInfoNoPermissionRequested; - private PackageInfo mPackageInfoPermissionRequestedQPlus; - private PackageInfo mPackageInfoPermissionRequestedPreQ; - private FinancialAppsController mController; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - mContext = spy(RuntimeEnvironment.application); - when(mContext.getPackageManager()).thenReturn(mPackageManager); - when(mContext.getSystemService(AppOpsManager.class)).thenReturn(mAppOpsManager); - - initializePackageInfos(); - - mController = new FinancialAppsController(mContext, "key"); - mController.displayPreference(mRoot); - } - - private void initializePackageInfos() { - mPackageInfoNoPermissionRequested = new PackageInfo(); - mPackageInfoNoPermissionRequested.applicationInfo = new ApplicationInfo(); - - mPackageInfoPermissionRequestedQPlus = new PackageInfo(); - mPackageInfoPermissionRequestedQPlus.applicationInfo = new ApplicationInfo(); - // TODO(b/121161546): update after robolectric test support Q - //mPackageInfoPermissionRequestedQPlus.applicationInfo.targetSdkVersion = - // Build.VERSION_CODES.Q; - mPackageInfoPermissionRequestedQPlus.applicationInfo.uid = 2001; - mPackageInfoPermissionRequestedQPlus.applicationInfo.nonLocalizedLabel = "QPLUS Package"; - mPackageInfoPermissionRequestedQPlus.packageName = "QPLUS"; - mPackageInfoPermissionRequestedQPlus.requestedPermissions = - new String[] {SMS_FINANCIAL_TRANSACTIONS}; - - mPackageInfoPermissionRequestedPreQ = new PackageInfo(); - mPackageInfoPermissionRequestedPreQ.applicationInfo = new ApplicationInfo(); - mPackageInfoPermissionRequestedPreQ.applicationInfo.targetSdkVersion = Build.VERSION_CODES.M; - mPackageInfoPermissionRequestedPreQ.applicationInfo.uid = 2002; - mPackageInfoPermissionRequestedPreQ.applicationInfo.nonLocalizedLabel = "PREQ Package"; - mPackageInfoPermissionRequestedPreQ.packageName = "PREQ"; - mPackageInfoPermissionRequestedPreQ.requestedPermissions = new String[] {READ_SMS}; - } - - @Test - public void isAvailable_true() { - assertThat(mController.isAvailable()).isTrue(); - } - - @Test - public void noPreferenceAddedWhenNoPackageRequestPermission() { - when(mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS)) - .thenReturn(new ArrayList( - Arrays.asList(mPackageInfoNoPermissionRequested))); - mController.updateState(null); - assertThat(mController.mRoot.getPreferenceCount()).isEqualTo(0); - } - - //TODO(b/121161546): Add these tests after robolectric test support Q - /* - @Test - public void preferenceAddedWhenPreQPackageRequestPermission() { - when(mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS)) - .thenReturn(new ArrayList( - Arrays.asList(mPackageInfoPermissionRequestedPreQ))); - mController.updateState(null); - assertThat(mController.mRoot.getPreferenceCount()).isEqualTo(1); - SwitchPreference pref = (SwitchPreference) mController.mRoot.getPreference(0); - assertThat(pref).isNotNull(); - } - - @Test - public void preferenceAddedWhenQPlusPackageRequestPermission() { - when(mPackageManager.getInstalledPackages(PackageManager.GET_PERMISSIONS)) - .thenReturn(new ArrayList( - Arrays.asList(mPackageInfoPermissionRequestedQPlus))); - mController.updateState(null); - assertThat(mController.mRoot.getPreferenceCount()).isEqualTo(1); - SwitchPreference pref = (SwitchPreference) mController.mRoot.getPreference(0); - assertThat(pref).isNotNull(); - }*/ -}