From 07037dbc3fdbaceb2c95e3d3909bf20563e9e12a Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Fri, 3 Sep 2021 04:14:53 +0000 Subject: [PATCH] Revert "Support two pane design in the Settings app." This reverts commit a12a0d1eb234e4841a6633d4614e91a28f5c1517. Reason for revert: See a build error in git_sc-v2-dev-plus-aosp/aosp_crosshatch-userdebug Bug: 198722766 Change-Id: Ibf812bf92595f57409e3c6d9cda6a1dfa4a8c72c --- AndroidManifest.xml | 4 +- .../android/settings/SettingsApplication.java | 34 ------ .../ActivityEmbeddingRulesController.java | 108 ------------------ .../ActivityEmbeddingUtils.java | 65 ----------- 4 files changed, 1 insertion(+), 210 deletions(-) delete mode 100644 src/com/android/settings/SettingsApplication.java delete mode 100644 src/com/android/settings/activityembedding/ActivityEmbeddingRulesController.java delete mode 100644 src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d8bbe8f2de7..c88639f39f1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -108,9 +108,7 @@ - activityFilters = new HashSet<>(); - activityFilters.add(new ActivityFilter(getComponentName(Settings.class))); - final Intent intent = new Intent(); - intent.setComponent(getComponentName(Settings.NetworkDashboardActivity.class)); - final SplitPlaceholderRule placeholderRule = new SplitPlaceholderRule( - activityFilters, - intent, - ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(mContext), - ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(mContext), - ActivityEmbeddingUtils.SPLIT_RATIO, - LayoutDirection.LOCALE); - - return placeholderRule; - } - - private SplitPairRule getSubSettingsPairRule() { - final Set pairFilters = new HashSet<>(); - pairFilters.add(new SplitPairFilter( - getComponentName(Settings.class), - getComponentName(SubSettings.class), - null /* secondaryActivityIntentAction */, - null /* secondaryActivityIntentCategory */)); - final SplitPairRule rule = new SplitPairRule( - pairFilters, - true /* finishPrimaryWithSecondary */, - true /* finishSecondaryWithPrimary */, - true /* clearTop */, - ActivityEmbeddingUtils.getMinCurrentScreenSplitWidthPx(mContext), - ActivityEmbeddingUtils.getMinSmallestScreenSplitWidthPx(mContext), - ActivityEmbeddingUtils.SPLIT_RATIO, - LayoutDirection.LOCALE); - - return rule; - } - - @NonNull - private ComponentName getComponentName(Class activityClass) { - return new ComponentName(mContext.getPackageName(), activityClass.getName()); - } -} diff --git a/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java b/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java deleted file mode 100644 index 96c37773fc1..00000000000 --- a/src/com/android/settings/activityembedding/ActivityEmbeddingUtils.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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.activityembedding; - -import android.content.Context; -import android.util.DisplayMetrics; -import android.util.FeatureFlagUtils; -import android.util.Log; -import android.util.TypedValue; - -import androidx.window.embedding.SplitController; - -/** An util class collecting all common methods for the embedding activity features. */ -public class ActivityEmbeddingUtils { - public static final float SPLIT_RATIO = 0.5f; - // The smallest value of current width of the window when the split should be used. - private static final float MIN_CURRENT_SCREEN_SPLIT_WIDTH_DP = 600f; - // The smallest value of the smallest-width (sw) of the window in any rotation when - // the split should be used. - private static final float MIN_SMALLEST_SCREEN_SPLIT_WIDTH_DP = 600f; - private static final String TAG = "ActivityEmbeddingUtils"; - - /** Get the smallest pixel value of width of the window when the split should be used. */ - public static int getMinCurrentScreenSplitWidthPx(Context context) { - final DisplayMetrics dm = context.getResources().getDisplayMetrics(); - return (int) TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, MIN_CURRENT_SCREEN_SPLIT_WIDTH_DP, dm); - } - - /** - * Get the smallest pixel value of the smallest-width (sw) of the window in any rotation when - * the split should be used. - */ - public static int getMinSmallestScreenSplitWidthPx(Context context) { - final DisplayMetrics dm = context.getResources().getDisplayMetrics(); - return (int) TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, MIN_SMALLEST_SCREEN_SPLIT_WIDTH_DP, dm); - } - - /** Whether to support embedding activity feature. */ - public static boolean isEmbeddingActivityEnabled(Context context) { - final boolean isFlagEnabled = FeatureFlagUtils.isEnabled(context, - FeatureFlagUtils.SETTINGS_SUPPORT_LARGE_SCREEN); - final boolean isSplitSupported = new SplitController(context).isSplitSupported(); - - Log.d(TAG, "isFlagEnabled = " + isFlagEnabled); - Log.d(TAG, "isSplitSupported = " + isSplitSupported); - - return isFlagEnabled && isSplitSupported; - } -}