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

Remove silky flag from System for official release

Browse Source 
Remove the silky condition and clean up redundant files.

Bug: 183670633
Test: robotests & visual
Change-Id: I2743a65869c4fe2ea684e259373ddc309dea59c3
This commit is contained in:
Yanting Yang
2021-05-26 23:49:28 +08:00
parent d5aaf326e7
commit 5035ef9f94
7 changed files with 23 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/system/ResetPreferenceController.java
View File

@@ -17,11 +17,9 @@ package com.android.settings.system;
import android.content.Context;
import android.os.UserManager;
import android.util.FeatureFlagUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.FeatureFlags;
import com.android.settings.network.NetworkResetPreferenceController;
public class ResetPreferenceController extends BasePreferenceController {
@@ -42,17 +40,4 @@ public class ResetPreferenceController extends BasePreferenceController {
return mContext.getResources().getBoolean(R.bool.config_show_reset_dashboard)
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
public CharSequence getSummary() {
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
return null;
}
if (!mNetworkReset.isAvailable() && !mFactpruReset.isAvailable()) {
return mContext.getText(R.string.reset_dashboard_summary_onlyApps);
}
return mContext.getText(R.string.reset_dashboard_summary);
}
}