diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-10-20 10:37:15 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2015-10-20 10:37:15 -0700 |
| commit | f912beb2ee4b75af1fe8c710d6948b9737fed531 (patch) | |
| tree | a8e5ae80d822105c36ff218b739b735a4d5ba9f6 /src/com/android/launcher3/LauncherAppState.java | |
| parent | 38ac73a095c99c18ca31b8d9cd14959a762928b7 (diff) | |
| parent | fe3db428abc07d253b816bf70d6820a8339becbc (diff) | |
| download | packages_apps_Trebuchet-f912beb2ee4b75af1fe8c710d6948b9737fed531.tar.gz packages_apps_Trebuchet-f912beb2ee4b75af1fe8c710d6948b9737fed531.tar.bz2 packages_apps_Trebuchet-f912beb2ee4b75af1fe8c710d6948b9737fed531.zip | |
resolve merge conflicts of fe3db428ab to ub-launcher3-master.
Change-Id: Icc60a61f621fefe9db67b178921e62f7d72d7e5a
Diffstat (limited to 'src/com/android/launcher3/LauncherAppState.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherAppState.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index 3b207a9cf..f0e34e513 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -161,10 +161,6 @@ public class LauncherAppState { return sLauncherProvider.get(); } - public static String getSharedPreferencesKey() { - return LauncherFiles.SHARED_PREFERENCES_KEY; - } - public WidgetPreviewLoader getWidgetCache() { return mWidgetCache; } |