summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-06-04 21:19:02 -0700
committerSunny Goyal <sunnygoyal@google.com>2015-06-04 21:20:08 -0700
commit12e13e467e6eadf8efe84525e9266b1f7df91733 (patch)
tree65d2a5f0fadd82b3595fe4c3ad9ab6eaa536706e
parent26c2842f07668385b8f4594848cf6e93502da4a3 (diff)
downloadandroid_packages_apps_Trebuchet-12e13e467e6eadf8efe84525e9266b1f7df91733.zip
android_packages_apps_Trebuchet-12e13e467e6eadf8efe84525e9266b1f7df91733.tar.gz
android_packages_apps_Trebuchet-12e13e467e6eadf8efe84525e9266b1f7df91733.tar.bz2
Removing LauncherApplication to enable us to easily catch LauncherAppState errors
Change-Id: I56e956067692e5b9c4719c5e08b8f558e6011a60
-rw-r--r--AndroidManifest.xml1
-rw-r--r--src/com/android/launcher3/Launcher.java1
-rw-r--r--src/com/android/launcher3/LauncherApplication.java34
3 files changed, 0 insertions, 36 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f9f5fc2..5f9d7f4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -70,7 +70,6 @@
<uses-permission android:name="com.android.launcher3.permission.RECEIVE_FIRST_LOAD_BROADCAST" />
<application
- android:name="com.android.launcher3.LauncherApplication"
android:allowBackup="@bool/enable_backup"
android:backupAgent="com.android.launcher3.LauncherBackupAgentHelper"
android:hardwareAccelerated="true"
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 6dfe0eb..ae6e7d4 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 8b179f1..0000000
--- 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