Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev (34cb6d32) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/applications/appinfo/AppLocalePreferenceController.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.net.Uri;
		import android.text.TextUtils;
		import android.util.FeatureFlagUtils;
		import android.util.Log;

		import androidx.annotation.VisibleForTesting;
		@@ -51,9 +50,7 @@ public class AppLocalePreferenceController extends AppInfoPreferenceControllerBa

		@Override
		public int getAvailabilityStatus() {
		boolean isFeatureOn = FeatureFlagUtils
		.isEnabled(mContext, FeatureFlagUtils.SETTINGS_APP_LANGUAGE_SELECTION);
		return isFeatureOn && canDisplayLocaleUi() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
		return canDisplayLocaleUi() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
		}

		@Override

src/com/android/settings/applications/appinfo/ManageAppLocalePreferenceController.java

deleted100644 → 0

+0 −40

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.applications.appinfo;

		import android.content.Context;
		import android.util.FeatureFlagUtils;

		import com.android.settings.core.BasePreferenceController;

		/**
		* A controller to update current locale information of application
		* and a entry to launch {@link ManageApplications}.
		* TODO(209775925) After feature release, this class may be removed.
		*/
		public class ManageAppLocalePreferenceController extends BasePreferenceController {
		public ManageAppLocalePreferenceController(Context context, String key) {
		super(context, key);
		}

		@Override
		public int getAvailabilityStatus() {
		return FeatureFlagUtils
		.isEnabled(mContext, FeatureFlagUtils.SETTINGS_APP_LANGUAGE_SELECTION)
		? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
		}
		}

tests/unit/src/com/android/settings/applications/appinfo/AppLocalePreferenceControllerTest.java

+2 −25

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.settings.applications.appinfo;
		import static com.google.common.truth.Truth.assertThat;

		import android.content.Context;
		import android.util.FeatureFlagUtils;

		import androidx.test.core.app.ApplicationProvider;
		import androidx.test.ext.junit.runners.AndroidJUnit4;
		@@ -49,22 +48,10 @@ public class AppLocalePreferenceControllerTest {
		return mCanDisplayLocaleUi;
		}
		};
		FeatureFlagUtils
		.setEnabled(mContext, FeatureFlagUtils.SETTINGS_APP_LANGUAGE_SELECTION, true);
		}

		@Test
		public void getAvailabilityStatus_canShowUiButFeatureFlagOff_shouldReturnUnavailable() {
		mCanDisplayLocaleUi = true;
		FeatureFlagUtils
		.setEnabled(mContext, FeatureFlagUtils.SETTINGS_APP_LANGUAGE_SELECTION, false);

		assertThat(mController.getAvailabilityStatus())
		.isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
		}

		@Test
		public void getAvailabilityStatus_canShowUiAndFeatureFlagOn_shouldReturnAvailable() {
		public void getAvailabilityStatus_canShowUi_shouldReturnAvailable() {
		mCanDisplayLocaleUi = true;

		assertThat(mController.getAvailabilityStatus())
		@@ -72,18 +59,8 @@ public class AppLocalePreferenceControllerTest {
		}

		@Test
		public void getAvailabilityStatus_featureFlagOnButCanNotShowUi_shouldReturnUnavailable() {
		mCanDisplayLocaleUi = false;

		assertThat(mController.getAvailabilityStatus())
		.isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
		}

		@Test
		public void getAvailabilityStatus_featureFlagOffAndCanNotShowUi_shouldReturnUnavailable() {
		public void getAvailabilityStatus_canNotShowUi_shouldReturnUnavailable() {
		mCanDisplayLocaleUi = false;
		FeatureFlagUtils
		.setEnabled(mContext, FeatureFlagUtils.SETTINGS_APP_LANGUAGE_SELECTION, false);

		assertThat(mController.getAvailabilityStatus())
		.isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);

tests/unit/src/com/android/settings/applications/appinfo/ManageAppLocalePreferenceControllerTest.java

deleted100644 → 0

+0 −66

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.applications.appinfo;

		import static com.google.common.truth.Truth.assertThat;

		import static org.mockito.Mockito.spy;

		import android.content.Context;
		import android.util.FeatureFlagUtils;

		import androidx.test.core.app.ApplicationProvider;
		import androidx.test.ext.junit.runners.AndroidJUnit4;


		import com.android.settings.core.BasePreferenceController;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.MockitoAnnotations;

		@RunWith(AndroidJUnit4.class)
		public class ManageAppLocalePreferenceControllerTest {
		private Context mContext;
		private ManageAppLocalePreferenceController mController;

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mContext = spy(ApplicationProvider.getApplicationContext());
		mController = spy(new ManageAppLocalePreferenceController(mContext, "a key"));

		FeatureFlagUtils
		.setEnabled(mContext, FeatureFlagUtils.SETTINGS_APP_LANGUAGE_SELECTION, true);
		}

		@Test
		public void getAvailabilityStatus_featureFlagOff_shouldReturnUnavailable() {
		FeatureFlagUtils
		.setEnabled(mContext, FeatureFlagUtils.SETTINGS_APP_LANGUAGE_SELECTION, false);

		assertThat(mController.getAvailabilityStatus())
		.isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
		}

		@Test
		public void getAvailabilityStatus_featureFlagOn_shouldReturnAvailable() {
		assertThat(mController.getAvailabilityStatus())
		.isEqualTo(BasePreferenceController.AVAILABLE);
		}
		}