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
This commit is contained in:
committed by
Android (Google) Code Review
commit
53bf6b1dc8
@@ -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;
|
||||||
}
|
}
|
||||||
|
@@ -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
|
||||||
|
Reference in New Issue
Block a user