From fa00135f5632967cb6da6f4dbedfa002fdc94f31 Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Thu, 14 Apr 2016 11:50:57 -0700 Subject: [PATCH] Bug 1247489 - Move Telemetry*Ping* to telemetry/pings pkg. r=grisha This should help make the Builders more discoverable when looking at the TelemetryPing class. MozReview-Commit-ID: K1OiSuKW5fO --HG-- rename : mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingBuilder.java => mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryCorePingBuilder.java rename : mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPing.java => mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryPing.java rename : mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPingBuilder.java => mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryPingBuilder.java extra : rebase_source : 0e9165b9230f4cc91066460cc72d12f36efe9a91 --- .../org/mozilla/gecko/telemetry/TelemetryUploadService.java | 2 ++ .../telemetry/{ => pings}/TelemetryCorePingBuilder.java | 4 ++-- .../mozilla/gecko/telemetry/{ => pings}/TelemetryPing.java | 2 +- .../gecko/telemetry/{ => pings}/TelemetryPingBuilder.java | 2 +- mobile/android/base/moz.build | 6 +++--- 5 files changed, 9 insertions(+), 7 deletions(-) rename mobile/android/base/java/org/mozilla/gecko/telemetry/{ => pings}/TelemetryCorePingBuilder.java (97%) rename mobile/android/base/java/org/mozilla/gecko/telemetry/{ => pings}/TelemetryPing.java (95%) rename mobile/android/base/java/org/mozilla/gecko/telemetry/{ => pings}/TelemetryPingBuilder.java (98%) diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryUploadService.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryUploadService.java index c3b23791b616..32e584e3634e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryUploadService.java +++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryUploadService.java @@ -22,6 +22,8 @@ import org.mozilla.gecko.preferences.GeckoPreferences; import org.mozilla.gecko.sync.net.BaseResource; import org.mozilla.gecko.sync.net.BaseResourceDelegate; import org.mozilla.gecko.sync.net.Resource; +import org.mozilla.gecko.telemetry.pings.TelemetryCorePingBuilder; +import org.mozilla.gecko.telemetry.pings.TelemetryPing; import org.mozilla.gecko.util.StringUtils; import java.io.IOException; diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingBuilder.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryCorePingBuilder.java similarity index 97% rename from mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingBuilder.java rename to mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryCorePingBuilder.java index 2cfab3c1d88b..6c2bd87bb66c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryCorePingBuilder.java +++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryCorePingBuilder.java @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.telemetry; +package org.mozilla.gecko.telemetry.pings; import android.content.Context; import android.os.Build; @@ -24,7 +24,7 @@ import java.util.Locale; * See https://gecko.readthedocs.org/en/latest/toolkit/components/telemetry/telemetry/core-ping.html * for details on the core ping. */ -class TelemetryCorePingBuilder extends TelemetryPingBuilder { +public class TelemetryCorePingBuilder extends TelemetryPingBuilder { private static final String NAME = "core"; private static final int VERSION_VALUE = 4; // For version history, see toolkit/components/telemetry/docs/core-ping.rst diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPing.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryPing.java similarity index 95% rename from mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPing.java rename to mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryPing.java index 857f3d617743..c65d7d3c92ae 100644 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPing.java +++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryPing.java @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.telemetry; +package org.mozilla.gecko.telemetry.pings; import org.mozilla.gecko.sync.ExtendedJSONObject; diff --git a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPingBuilder.java b/mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryPingBuilder.java similarity index 98% rename from mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPingBuilder.java rename to mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryPingBuilder.java index 5eb488a49797..6d823d4f2d30 100644 --- a/mobile/android/base/java/org/mozilla/gecko/telemetry/TelemetryPingBuilder.java +++ b/mobile/android/base/java/org/mozilla/gecko/telemetry/pings/TelemetryPingBuilder.java @@ -4,7 +4,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.mozilla.gecko.telemetry; +package org.mozilla.gecko.telemetry.pings; import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.sync.ExtendedJSONObject; diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index 475404411d2b..656ec8bc2a46 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -572,10 +572,10 @@ gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [ 'tabs/TabsPanel.java', 'tabs/TabsPanelThumbnailView.java', 'Telemetry.java', + 'telemetry/pings/TelemetryCorePingBuilder.java', + 'telemetry/pings/TelemetryPing.java', + 'telemetry/pings/TelemetryPingBuilder.java', 'telemetry/TelemetryConstants.java', - 'telemetry/TelemetryCorePingBuilder.java', - 'telemetry/TelemetryPing.java', - 'telemetry/TelemetryPingBuilder.java', 'telemetry/TelemetryUploadService.java', 'TelemetryContract.java', 'text/FloatingActionModeCallback.java',