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

Merge "Hides app buttons for instant apps" into oc-dev

Browse Source 
am: 965508fc3e

Change-Id: I6158a7d6f96ea144b16cda70fe1ed9fb989c5d8d
This commit is contained in:
Jesse Evans
2017-05-02 00:34:02 +00:00
committed by android-build-merger
parent 33d77b09a6 965508fc3e
commit 34e0c7afdf
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
View File

@@ -60,6 +60,7 @@ import com.android.settings.core.lifecycle.events.OnResume;
import com.android.settings.enterprise.DevicePolicyManagerWrapper;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import java.util.ArrayList;
@@ -155,7 +156,8 @@ public class AppButtonsPreferenceController extends PreferenceController impleme
@Override
public boolean isAvailable() {
return mAppEntry != null;
// TODO(b/37313605): Re-enable once this controller supports instant apps
return mAppEntry != null && !AppUtils.isInstant(mAppEntry.info);
}
@Override