diff options
| author | d34d <clark@cyngn.com> | 2015-11-10 14:53:26 -0800 |
|---|---|---|
| committer | Clark Scheff <clark@cyngn.com> | 2015-11-11 16:24:16 -0800 |
| commit | 7dbd9660fd607655028f28a86c93f8d9cb78c324 (patch) | |
| tree | b20640e9d96f7b240f495679d17a8e2fc0c8bf35 | |
| parent | b31f1cc9e7827bf59571621295e32b2091056faa (diff) | |
| download | android_packages_apps_Trebuchet-7dbd9660fd607655028f28a86c93f8d9cb78c324.tar.gz android_packages_apps_Trebuchet-7dbd9660fd607655028f28a86c93f8d9cb78c324.tar.bz2 android_packages_apps_Trebuchet-7dbd9660fd607655028f28a86c93f8d9cb78c324.zip | |
Trebuchet: Move PROTECTED_COMPONENTS to CMSettings
Change-Id: I568e3a97e37cb4dee360c138ae481e12b99c46fc
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/AppDrawerListAdapter.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/AppsCustomizePagedView.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 22594750e..b8e6be436 100644 --- a/Android.mk +++ b/Android.mk @@ -25,7 +25,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 \ android-support-v7-recyclerview \ - guava + guava \ + org.cyanogenmod.platform.internal LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-java-files-under, WallpaperPicker/src) \ diff --git a/src/com/android/launcher3/AppDrawerListAdapter.java b/src/com/android/launcher3/AppDrawerListAdapter.java index 3639e11f4..7132166a0 100644 --- a/src/com/android/launcher3/AppDrawerListAdapter.java +++ b/src/com/android/launcher3/AppDrawerListAdapter.java @@ -39,6 +39,7 @@ import android.widget.SectionIndexer; import com.android.launcher3.locale.LocaleSetManager; import com.android.launcher3.locale.LocaleUtils; import com.android.launcher3.settings.SettingsProvider; +import cyanogenmod.providers.CMSettings; import java.util.ArrayList; import java.util.Collections; @@ -929,7 +930,7 @@ public class AppDrawerListAdapter extends RecyclerView.Adapter<AppDrawerListAdap } private void updateProtectedAppsList(Context context) { - String protectedComponents = Settings.Secure.getString(context.getContentResolver(), + String protectedComponents = CMSettings.Secure.getString(context.getContentResolver(), LauncherModel.SETTINGS_PROTECTED_COMPONENTS); protectedComponents = protectedComponents == null ? "" : protectedComponents; String [] flattened = protectedComponents.split("\\|"); diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index fc07fa102..08c3870f9 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -50,6 +50,7 @@ import android.widget.Toast; import com.android.launcher3.DropTarget.DragObject; import com.android.launcher3.compat.AppWidgetManagerCompat; import com.android.launcher3.settings.SettingsProvider; +import cyanogenmod.providers.CMSettings; import java.util.ArrayList; import java.util.Collections; @@ -1909,7 +1910,7 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen private void updateProtectedAppsList(Context context) { - String protectedComponents = Settings.Secure.getString(context.getContentResolver(), + String protectedComponents = CMSettings.Secure.getString(context.getContentResolver(), LauncherModel.SETTINGS_PROTECTED_COMPONENTS); protectedComponents = protectedComponents == null ? "" : protectedComponents; String [] flattened = protectedComponents.split("\\|"); diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index dae2c180f..255c6f6f5 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -62,6 +62,7 @@ import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.settings.SettingsProvider; import com.android.launcher3.stats.internal.service.AggregationIntentService; +import cyanogenmod.providers.CMSettings; import java.lang.ref.WeakReference; import java.net.URISyntaxException; @@ -2781,7 +2782,7 @@ public class LauncherModel extends BroadcastReceiver ArrayList<String> mHiddenAppsPackages = new ArrayList<String>(); Context context = mApp.getContext(); // Since Trebuchet is compiled using the SDK we have to hardcode this string - String protectedComponents = Settings.Secure.getString(context.getContentResolver(), + String protectedComponents = CMSettings.Secure.getString(context.getContentResolver(), SETTINGS_PROTECTED_COMPONENTS); protectedComponents = protectedComponents == null ? "" : protectedComponents; String[] flattened = protectedComponents.split("\\|"); |