diff options
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index b2f96d099..eacf72aa1 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -114,6 +114,7 @@ import com.android.launcher3.logging.UserEventDispatcher; import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.userevent.nano.LauncherLogProto; import com.android.launcher3.util.ComponentKey; +import com.android.launcher3.logging.FileLog; import com.android.launcher3.util.TestingUtils; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.ViewOnDrawExecutor; @@ -123,11 +124,9 @@ import com.android.launcher3.widget.WidgetsContainerView; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.text.DateFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Date; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -307,11 +306,6 @@ public class Launcher extends Activity private final ArrayList<Integer> mSynchronouslyBoundPages = new ArrayList<Integer>(); private static final boolean DISABLE_SYNCHRONOUS_BINDING_CURRENT_PAGE = false; - private static final ArrayList<String> sDumpLogs = new ArrayList<String>(); - private static final Date sDateStamp = new Date(); - private static final DateFormat sDateFormat = - DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); - // We only want to get the SharedPreferences once since it does an FS stat each time we get // it from the context. private SharedPreferences mSharedPrefs; @@ -502,9 +496,10 @@ public class Launcher extends Activity } private void loadExtractedColorsAndColorItems() { - if (mExtractedColors != null) { + // TODO: do this in pre-N as well, once the extraction part is complete. + if (mExtractedColors != null && Utilities.isNycOrAbove()) { mExtractedColors.load(this); - // TODO: pass mExtractedColors to interested items such as hotseat. + mHotseat.updateColor(mExtractedColors, !mPaused); } } @@ -3976,7 +3971,7 @@ public class Launcher extends Activity // Verify that we own the widget if (appWidgetInfo == null) { - Log.e(TAG, "Removing invalid widget: id=" + item.appWidgetId); + FileLog.e(TAG, "Removing invalid widget: id=" + item.appWidgetId); deleteWidgetInfo(item); return; } @@ -4649,12 +4644,10 @@ public class Launcher extends Activity } } - synchronized (sDumpLogs) { - writer.println(); - writer.println(prefix + "Debug logs"); - for (String log : sDumpLogs) { - writer.println(prefix + " " + log); - } + try { + FileLog.flushAll(writer); + } catch (Exception e) { + // Ignore } if (mLauncherCallbacks != null) { @@ -4662,14 +4655,6 @@ public class Launcher extends Activity } } - public static void addDumpLog(String tag, String log) { - Log.d(tag, log); - synchronized(sDumpLogs) { - sDateStamp.setTime(System.currentTimeMillis()); - sDumpLogs.add(sDateFormat.format(sDateStamp) + ": " + tag + ", " + log); - } - } - public static CustomAppWidget getCustomAppWidget(String name) { return sCustomAppWidgets.get(name); } |