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

Merge "Enabling App Cloning Device Config flags by default. The features will be guarded *only* by config overlays, which are off by default." into udc-dev am: 53bf6b1dc8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22381242

Change-Id: Iea1458738e3360c374d3cf843da35db2aa14cd1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Himanshu Gupta
2023-05-09 22:05:15 +00:00
committed by Automerger Merge Worker
parent 26cc21e52d 53bf6b1dc8
commit 0eff752b20
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/ClonedAppsPreferenceController.java
View File

@@ -56,7 +56,7 @@ public class ClonedAppsPreferenceController extends BasePreferenceController
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_APP_CLONING, return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_APP_CLONING,
PROPERTY_CLONED_APPS_ENABLED, false) PROPERTY_CLONED_APPS_ENABLED, true)
&& mContext.getResources().getBoolean(R.bool.config_cloned_apps_page_enabled) && mContext.getResources().getBoolean(R.bool.config_cloned_apps_page_enabled)
? AVAILABLE : UNSUPPORTED_ON_DEVICE; ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
} }

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

@@ -880,7 +880,7 @@ public class ManageApplications extends InstrumentedFragment
mOptionsMenu.findItem(R.id.delete_all_app_clones) mOptionsMenu.findItem(R.id.delete_all_app_clones)
.setVisible(mListType == LIST_TYPE_CLONED_APPS && DeviceConfig.getBoolean( .setVisible(mListType == LIST_TYPE_CLONED_APPS && DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_APP_CLONING, PROPERTY_DELETE_ALL_APP_CLONES_ENABLED, DeviceConfig.NAMESPACE_APP_CLONING, PROPERTY_DELETE_ALL_APP_CLONES_ENABLED,
false) && Utils.getCloneUserId(getContext()) != -1); true) && Utils.getCloneUserId(getContext()) != -1);
} }
@Override @Override