| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 package org.chromium.blimp.settings; | 5 package org.chromium.blimp.app.settings; |
| 6 | 6 |
| 7 import android.app.Activity; | 7 import android.app.Activity; |
| 8 import android.app.AlertDialog; | |
| 9 import android.content.Context; | 8 import android.content.Context; |
| 10 import android.content.DialogInterface; | 9 import android.content.DialogInterface; |
| 11 import android.content.Intent; | 10 import android.content.Intent; |
| 12 import android.content.pm.ApplicationInfo; | 11 import android.content.pm.ApplicationInfo; |
| 13 import android.content.pm.PackageInfo; | 12 import android.content.pm.PackageInfo; |
| 14 import android.content.pm.PackageManager; | 13 import android.content.pm.PackageManager; |
| 15 import android.os.Build; | 14 import android.os.Build; |
| 16 import android.os.Bundle; | 15 import android.os.Bundle; |
| 17 import android.preference.ListPreference; | 16 import android.preference.ListPreference; |
| 18 import android.preference.Preference; | 17 import android.preference.Preference; |
| 19 import android.preference.PreferenceFragment; | 18 import android.preference.PreferenceFragment; |
| 19 import android.support.v7.app.AlertDialog; |
| 20 import android.text.TextUtils; | 20 import android.text.TextUtils; |
| 21 | 21 |
| 22 import org.chromium.base.Log; | 22 import org.chromium.base.Log; |
| 23 import org.chromium.blimp.BrowserRestartActivity; | 23 import org.chromium.blimp.app.BrowserRestartActivity; |
| 24 import org.chromium.blimp.R; | 24 import org.chromium.blimp.app.R; |
| 25 import org.chromium.blimp.preferences.PreferencesUtil; | 25 import org.chromium.blimp.app.preferences.PreferencesUtil; |
| 26 | 26 |
| 27 /** | 27 /** |
| 28 * Fragment to display blimp client and engine version related info. | 28 * Fragment to display blimp client and engine version related info. |
| 29 */ | 29 */ |
| 30 public class AboutBlimpPreferences extends PreferenceFragment { | 30 public class AboutBlimpPreferences extends PreferenceFragment { |
| 31 private static final String TAG = "AboutBlimp"; | 31 private static final String TAG = "AboutBlimp"; |
| 32 public static final String EXTRA_ENGINE_IP = "engine_ip"; | 32 public static final String EXTRA_ENGINE_IP = "engine_ip"; |
| 33 public static final String EXTRA_ENGINE_VERSION = "engine_version"; | 33 public static final String EXTRA_ENGINE_VERSION = "engine_version"; |
| 34 | 34 |
| 35 private static final String PREF_APPLICATION_VERSION = "application_version"
; | 35 private static final String PREF_APPLICATION_VERSION = "application_version"
; |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 }) | 128 }) |
| 129 .create() | 129 .create() |
| 130 .show(); | 130 .show(); |
| 131 } | 131 } |
| 132 | 132 |
| 133 private void restartBrowser(Context context) { | 133 private void restartBrowser(Context context) { |
| 134 Intent intent = BrowserRestartActivity.createRestartIntent(context); | 134 Intent intent = BrowserRestartActivity.createRestartIntent(context); |
| 135 context.startActivity(intent); | 135 context.startActivity(intent); |
| 136 } | 136 } |
| 137 } | 137 } |
| OLD | NEW |