blimp/client/app/android/java/src/org/chromium/blimp/app/settings/AboutBlimpPreferences.java - Issue 2493333002: Move Java Blimp shell code to app subpackage

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

« no previous file with comments | « blimp/client/app/android/java/src/org/chromium/blimp/app/session/TabControlFeature.java ('k') | blimp/client/app/android/java/src/org/chromium/blimp/app/settings/Preferences.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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.