diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-06-08 23:05:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-08 23:05:31 +0000 |
commit | 208aba2dfd13afefc65afe66d8f9cf233a017365 (patch) | |
tree | 3b1c91ccbd490b13c126e5c63db83f78f8312766 /src | |
parent | be68dcebbbe56a5063922068334565d07be6d936 (diff) | |
parent | 12e13e467e6eadf8efe84525e9266b1f7df91733 (diff) | |
download | android_packages_apps_Trebuchet-208aba2dfd13afefc65afe66d8f9cf233a017365.tar.gz android_packages_apps_Trebuchet-208aba2dfd13afefc65afe66d8f9cf233a017365.tar.bz2 android_packages_apps_Trebuchet-208aba2dfd13afefc65afe66d8f9cf233a017365.zip |
Merge "Removing LauncherApplication to enable us to easily catch LauncherAppState errors" into ub-launcher3-burnaby
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherApplication.java | 34 |
2 files changed, 0 insertions, 35 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 54aa8de4f..076a6e657 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -465,7 +465,6 @@ public class Launcher extends Activity app.getInvariantDeviceProfile().landscapeProfile : app.getInvariantDeviceProfile().portraitProfile; - // the LauncherApplication should call this, but in case of Instrumentation it might not be present yet mSharedPrefs = getSharedPreferences(LauncherAppState.getSharedPreferencesKey(), Context.MODE_PRIVATE); mIsSafeModeEnabled = getPackageManager().isSafeMode(); diff --git a/src/com/android/launcher3/LauncherApplication.java b/src/com/android/launcher3/LauncherApplication.java deleted file mode 100644 index 8b179f1e7..000000000 --- a/src/com/android/launcher3/LauncherApplication.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.launcher3; - -import android.app.Application; - -public class LauncherApplication extends Application { - @Override - public void onCreate() { - super.onCreate(); - LauncherAppState.setApplicationContext(this); - LauncherAppState.getInstance(); - } - - @Override - public void onTerminate() { - super.onTerminate(); - LauncherAppState.getInstance().onTerminate(); - } -}
\ No newline at end of file |