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

Merge "Remove the Summary of Backup in System Settings" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-04 14:00:49 +00:00
committed by Android (Google) Code Review
parent d6913243a1 609d900f4d
commit 31a697eb79
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -3267,8 +3267,6 @@
<!-- Tell Settings app which category it belongs to --> <!-- Tell Settings app which category it belongs to -->
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" /> android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.summary_uri"
android:value="content://com.android.settings.dashboard.SummaryProvider/backup" />
<meta-data android:name="com.android.settings.order" android:value="-60"/> <meta-data android:name="com.android.settings.order" android:value="-60"/>
</activity> </activity>

5
src/com/android/settings/backup/BackupSettingsHelper.java
View File

@@ -26,14 +26,12 @@ import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.FeatureFlagUtils;
import android.util.Log; import android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Settings.PrivacySettingsActivity; import com.android.settings.Settings.PrivacySettingsActivity;
import com.android.settings.core.FeatureFlags;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@@ -57,9 +55,6 @@ public class BackupSettingsHelper {
* Otherwise, show nothing. * Otherwise, show nothing.
*/ */
public String getSummary() { public String getSummary() {
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
return null;
}
UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE); UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
if (userManager.getUserProfiles().size() == 1) { if (userManager.getUserProfiles().size() == 1) {
try { try {