Move code around for better organization.

Bug: 34944625
Test: adb shell am instrument -w com.android.networkrecommendation.tests/android.support.test.runner.AndroidJUnitRunner

Change-Id: If50a041009c1015319b1fad3dd30256e3c235a53

11 files changed, 47 insertions, 20 deletions

diff --git a/src/com/android/networkrecommendation/DefaultNetworkRecommendationProvider.java b/src/com/android/networkrecommendation/DefaultNetworkRecommendationProvider.java
index 355d2b8..0a585f4 100644
--- a/src/com/android/networkrecommendation/DefaultNetworkRecommendationProvider.java
+++ b/src/com/android/networkrecommendation/DefaultNetworkRecommendationProvider.java
@@ -33,6 +33,8 @@ import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
 
+import com.android.networkrecommendation.util.ScanResultUtil;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -49,13 +51,13 @@ import javax.annotation.concurrent.GuardedBy;
  * <p>This recommender is not yet recommended for non-development devices.
  *
  * <p>To debug:
- * $ adb shell dumpsys activity service DefaultNetworkRecommendationService
+ * $ adb shell dumpsys activity service NetworkRecommendationService
  *
  * <p>Clear stored scores:
- * $ adb shell dumpsys activity service DefaultNetworkRecommendationService clear
+ * $ adb shell dumpsys activity service NetworkRecommendationService clear
  *
  * <p>Score a network:
- * $ adb shell dumpsys activity service DefaultNetworkRecommendationService addScore $SCORE
+ * $ adb shell dumpsys activity service NetworkRecommendationService addScore $SCORE
  *
  * <p>SCORE: "Quoted SSID",bssid|$RSSI_CURVE|metered|captivePortal|BADGE
  *
@@ -67,17 +69,17 @@ import javax.annotation.concurrent.GuardedBy;
  *
  * <p>All commands should be executed on one line, no spaces between each line of the command..
  * <p>Eg, A high quality, paid network with captive portal:
- * $ adb shell dumpsys activity service DefaultNetworkRecommendationService addScore \
+ * $ adb shell dumpsys activity service NetworkRecommendationService addScore \
  * '\"Metered\",aa:bb:cc:dd:ee:ff\|
  * 10,-128,-128,-128,-128,-128,-128,-128,-128,27,27,27,27,27,-128\|1\|1'
  *
  * <p>Eg, A high quality, unmetered network with captive portal:
- * $ adb shell dumpsys activity service DefaultNetworkRecommendationService addScore \
+ * $ adb shell dumpsys activity service NetworkRecommendationService addScore \
  * '\"Captive\",aa:bb:cc:dd:ee:ff\|
  * 10,-128,-128,-128,-128,-128,-128,-128,-128,28,28,28,28,28,-128\|0\|1'
  *
  * <p>Eg, A high quality, unmetered network with any bssid:
- * $ adb shell dumpsys activity service DefaultNetworkRecommendationService addScore \
+ * $ adb shell dumpsys activity service NetworkRecommendationService addScore \
  * '\"AnySsid\",00:00:00:00:00:00\|
  * 10,-128,-128,-128,-128,-128,-128,-128,-128,29,29,29,29,29,-128\|0\|0'
  */
diff --git a/src/com/android/networkrecommendation/DefaultNetworkRecommendationService.java b/src/com/android/networkrecommendation/NetworkRecommendationService.java
index 64e4f13..6583762 100644
--- a/src/com/android/networkrecommendation/DefaultNetworkRecommendationService.java
+++ b/src/com/android/networkrecommendation/NetworkRecommendationService.java
@@ -28,13 +28,19 @@ import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.Looper;
 
+import com.android.networkrecommendation.notify.WifiNotificationController;
+import com.android.networkrecommendation.notify.WifiNotificationHelper;
+import com.android.networkrecommendation.wakeup.WifiWakeupController;
+import com.android.networkrecommendation.wakeup.WifiWakeupNetworkSelector;
+import com.android.networkrecommendation.wakeup.WifiWakeupNotificationHelper;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 
 /**
  * Provides network recommendations for the platform.
  */
-public class DefaultNetworkRecommendationService extends Service {
+public class NetworkRecommendationService extends Service {
 
     private HandlerThread mHandlerThread;
     private Handler mHandler;
diff --git a/src/com/android/networkrecommendation/SynchronousNetworkRecommendationProvider.java b/src/com/android/networkrecommendation/SynchronousNetworkRecommendationProvider.java
index 44a7e0d..b2ff12c 100644
--- a/src/com/android/networkrecommendation/SynchronousNetworkRecommendationProvider.java
+++ b/src/com/android/networkrecommendation/SynchronousNetworkRecommendationProvider.java
@@ -24,7 +24,7 @@ import android.net.ScoredNetwork;
 /**
  * Provider to return {@link ScoredNetwork} from cached scores in NetworkRecommendationProvider.
  */
-interface SynchronousNetworkRecommendationProvider {
+public interface SynchronousNetworkRecommendationProvider {
 
     /** Returns a {@link ScoredNetwork} if present in the cache. Otherwise, return null. */
     ScoredNetwork getCachedScoredNetwork(NetworkKey networkKey);
diff --git a/src/com/android/networkrecommendation/WifiNotificationController.java b/src/com/android/networkrecommendation/notify/WifiNotificationController.java
index 9dbb665..a7afcdd 100644
--- a/src/com/android/networkrecommendation/WifiNotificationController.java
+++ b/src/com/android/networkrecommendation/notify/WifiNotificationController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.networkrecommendation;
+package com.android.networkrecommendation.notify;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -37,6 +37,9 @@ import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.support.annotation.VisibleForTesting;
 
+import com.android.networkrecommendation.R;
+import com.android.networkrecommendation.SynchronousNetworkRecommendationProvider;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
@@ -147,7 +150,8 @@ public class WifiNotificationController {
     private NetworkInfo.DetailedState mDetailedState;
     private volatile int mWifiState;
 
-    WifiNotificationController(Context context, ContentResolver contentResolver, Handler handler,
+    public WifiNotificationController(Context context, ContentResolver contentResolver,
+            Handler handler,
             SynchronousNetworkRecommendationProvider networkRecommendationProvider,
             WifiManager wifiManager, NotificationManager notificationManager,
             WifiNotificationHelper helper) {
@@ -417,7 +421,8 @@ public class WifiNotificationController {
         mNotificationShown = false;
     }
 
-    void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+    /** Dump debugging information. */
+    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         pw.println("mNotificationEnabled " + mNotificationEnabled);
         pw.println("mNotificationRepeatTime " + mNotificationRepeatTime);
         pw.println("mNotificationShown " + mNotificationShown);
diff --git a/src/com/android/networkrecommendation/WifiNotificationHelper.java b/src/com/android/networkrecommendation/notify/WifiNotificationHelper.java
index e4c8c4e..f37d0c1 100644
--- a/src/com/android/networkrecommendation/WifiNotificationHelper.java
+++ b/src/com/android/networkrecommendation/notify/WifiNotificationHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.networkrecommendation;
+package com.android.networkrecommendation.notify;
 
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 
@@ -40,6 +40,11 @@ import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 
+import com.android.networkrecommendation.R;
+import com.android.networkrecommendation.SynchronousNetworkRecommendationProvider;
+import com.android.networkrecommendation.util.ImageUtils;
+import com.android.networkrecommendation.util.WifiConfigurationUtil;
+
 import java.util.List;
 
 /**
diff --git a/src/com/android/networkrecommendation/ImageUtils.java b/src/com/android/networkrecommendation/util/ImageUtils.java
index 4b3d042..e870563 100644
--- a/src/com/android/networkrecommendation/ImageUtils.java
+++ b/src/com/android/networkrecommendation/util/ImageUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.networkrecommendation;
+package com.android.networkrecommendation.util;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
diff --git a/src/com/android/networkrecommendation/ScanResultUtil.java b/src/com/android/networkrecommendation/util/ScanResultUtil.java
index 08b71d0..c7b4e25 100644
--- a/src/com/android/networkrecommendation/ScanResultUtil.java
+++ b/src/com/android/networkrecommendation/util/ScanResultUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.networkrecommendation;
+package com.android.networkrecommendation.util;
 
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
diff --git a/src/com/android/networkrecommendation/WifiConfigurationUtil.java b/src/com/android/networkrecommendation/util/WifiConfigurationUtil.java
index d653a4f..3616cd7 100644
--- a/src/com/android/networkrecommendation/WifiConfigurationUtil.java
+++ b/src/com/android/networkrecommendation/util/WifiConfigurationUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.networkrecommendation;
+package com.android.networkrecommendation.util;
 
 import android.net.wifi.WifiConfiguration;
 
diff --git a/src/com/android/networkrecommendation/WifiWakeupController.java b/src/com/android/networkrecommendation/wakeup/WifiWakeupController.java
index 5fe65ef..a62bfbd 100644
--- a/src/com/android/networkrecommendation/WifiWakeupController.java
+++ b/src/com/android/networkrecommendation/wakeup/WifiWakeupController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.networkrecommendation;
+package com.android.networkrecommendation.wakeup;
 
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
@@ -34,6 +34,8 @@ import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Log;
 
+import com.android.networkrecommendation.util.WifiConfigurationUtil;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.List;
@@ -78,7 +80,7 @@ public class WifiWakeupController {
     private boolean mWifiWakeupEnabled;
     private boolean mAirplaneModeEnabled;
 
-    WifiWakeupController(Context context, ContentResolver contentResolver, Looper looper,
+    public WifiWakeupController(Context context, ContentResolver contentResolver, Looper looper,
             WifiManager wifiManager, WifiWakeupNetworkSelector wifiWakeupNetworkSelector,
             WifiWakeupNotificationHelper wifiWakeupNotificationHelper) {
         mContext = context;
@@ -269,7 +271,8 @@ public class WifiWakeupController {
         }
     }
 
-    void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+    /** Dump debugging information. */
+    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         pw.println("mStarted " + mStarted.get());
         pw.println("mWifiWakeupEnabled: " + mWifiWakeupEnabled);
         pw.println("mSavedSsids: " + mSavedSsids);
diff --git a/src/com/android/networkrecommendation/WifiWakeupNetworkSelector.java b/src/com/android/networkrecommendation/wakeup/WifiWakeupNetworkSelector.java
index 94fce56..7e3e884 100644
--- a/src/com/android/networkrecommendation/WifiWakeupNetworkSelector.java
+++ b/src/com/android/networkrecommendation/wakeup/WifiWakeupNetworkSelector.java
@@ -14,12 +14,16 @@
  * limitations under the License.
  */
 
-package com.android.networkrecommendation;
+package com.android.networkrecommendation.wakeup;
 
 import android.content.res.Resources;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
 
+import com.android.networkrecommendation.R;
+import com.android.networkrecommendation.util.ScanResultUtil;
+import com.android.networkrecommendation.util.WifiConfigurationUtil;
+
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/com/android/networkrecommendation/WifiWakeupNotificationHelper.java b/src/com/android/networkrecommendation/wakeup/WifiWakeupNotificationHelper.java
index 4a90486..2659752 100644
--- a/src/com/android/networkrecommendation/WifiWakeupNotificationHelper.java
+++ b/src/com/android/networkrecommendation/wakeup/WifiWakeupNotificationHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.networkrecommendation;
+package com.android.networkrecommendation.wakeup;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -36,6 +36,8 @@ import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.Log;
 
+import com.android.networkrecommendation.R;
+
 import java.util.Set;
 import java.util.concurrent.TimeUnit;