PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate silky flag for official release" into sc-dev

Browse Source
This commit is contained in:
Yanting Yang
2021-06-03 04:05:26 +00:00
committed by Android (Google) Code Review
parent a19c7053a2 90a9714cc0
commit 09666f9ef4
6 changed files with 36 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -55,7 +55,6 @@ import android.os.UserManager;
import android.preference.PreferenceFrameLayout;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.FeatureFlagUtils;
import android.util.IconDrawableFactory;
import android.util.Log;
import android.view.LayoutInflater;
@@ -112,7 +111,6 @@ import com.android.settings.applications.appinfo.ExternalSourcesDetails;
import com.android.settings.applications.appinfo.ManageExternalStorageDetails;
import com.android.settings.applications.appinfo.MediaManagementAppsDetails;
import com.android.settings.applications.appinfo.WriteSettingsDetails;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
@@ -396,11 +394,7 @@ public class ManageApplications extends InstrumentedFragment
return mRootView;
}
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
mRootView = inflater.inflate(R.layout.manage_applications_apps_v2, null);
} else {
mRootView = inflater.inflate(R.layout.manage_applications_apps, null);
}
mRootView = inflater.inflate(R.layout.manage_applications_apps, null);
mLoadingContainer = mRootView.findViewById(R.id.loading_container);
mListContainer = mRootView.findViewById(R.id.list_container);
if (mListContainer != null) {

1
src/com/android/settings/core/FeatureFlags.java
View File

@@ -27,6 +27,5 @@ public class FeatureFlags {
public static final String CONTROLLER_ENHANCEMENT = "settings_controller_loading_enhancement";
public static final String CONDITIONAL_CARDS = "settings_conditionals";
public static final String TETHER_ALL_IN_ONE = "settings_tether_all_in_one";
public static final String SILKY_HOME = "settings_silky_home";
public static final String CONTEXTUAL_HOME = "settings_contextual_home";
}

4
src/com/android/settings/core/SettingsBaseActivity.java
View File

@@ -31,7 +31,6 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -116,8 +115,7 @@ public class SettingsBaseActivity extends FragmentActivity {
ThemeHelper.trySetDynamicColor(this);
}
if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SILKY_HOME)
&& isToolbarEnabled() && !isAnySetupWizard) {
if (isToolbarEnabled() && !isAnySetupWizard) {
super.setContentView(R.layout.collapsing_toolbar_base_layout);
mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar);
} else {