Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(681)

Unified Diff: blimp/client/app/android/java/src/org/chromium/blimp/app/settings/AboutBlimpPreferences.java

Issue 2493333002: Move Java Blimp shell code to app subpackage (Closed)
Patch Set: Merge branch 'refs/heads/master' into blimp-shell-integration Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: blimp/client/app/android/java/src/org/chromium/blimp/app/settings/AboutBlimpPreferences.java
diff --git a/blimp/client/app/android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.java b/blimp/client/app/android/java/src/org/chromium/blimp/app/settings/AboutBlimpPreferences.java
similarity index 95%
rename from blimp/client/app/android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.java
rename to blimp/client/app/android/java/src/org/chromium/blimp/app/settings/AboutBlimpPreferences.java
index af62ca53e6b01c9c3708faef2037d8d84bb8b9df..9b6b8ab12691b3b036367a213dc2e6a0a3e027ce 100644
--- a/blimp/client/app/android/java/src/org/chromium/blimp/settings/AboutBlimpPreferences.java
+++ b/blimp/client/app/android/java/src/org/chromium/blimp/app/settings/AboutBlimpPreferences.java
@@ -2,10 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.blimp.settings;
+package org.chromium.blimp.app.settings;
import android.app.Activity;
-import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -17,12 +16,13 @@ import android.os.Bundle;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceFragment;
+import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import org.chromium.base.Log;
-import org.chromium.blimp.BrowserRestartActivity;
-import org.chromium.blimp.R;
-import org.chromium.blimp.preferences.PreferencesUtil;
+import org.chromium.blimp.app.BrowserRestartActivity;
+import org.chromium.blimp.app.R;
+import org.chromium.blimp.app.preferences.PreferencesUtil;
/**
* Fragment to display blimp client and engine version related info.

Powered by Google App Engine
This is Rietveld 408576698