diff options
| author | lambroslambrou <lambroslambrou@chromium.org> | 2016-02-04 15:38:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-04 23:40:03 +0000 |
| commit | 8d2c455e9416e87f5e8bf06876f374343ff1c4a2 (patch) | |
| tree | 841874e8d6fde73bb5b89e05a79a4b9776f53215 /remoting/android | |
| parent | 6a12a442ff2cc6395fa6ad24d1ce54ff68df57bb (diff) | |
| download | chromium_src-8d2c455e9416e87f5e8bf06876f374343ff1c4a2.zip chromium_src-8d2c455e9416e87f5e8bf06876f374343ff1c4a2.tar.gz chromium_src-8d2c455e9416e87f5e8bf06876f374343ff1c4a2.tar.bz2 | |
Move HelpActivity class into org.chromium.chromoting.help package.
Review URL: https://codereview.chromium.org/1666663003
Cr-Commit-Position: refs/heads/master@{#373661}
Diffstat (limited to 'remoting/android')
| -rw-r--r-- | remoting/android/client_java_tmpl.gni | 2 | ||||
| -rw-r--r-- | remoting/android/java/AndroidManifest.xml.jinja2 | 2 | ||||
| -rw-r--r-- | remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java (renamed from remoting/android/java/src/org/chromium/chromoting/HelpActivity.java) | 3 | ||||
| -rw-r--r-- | remoting/android/java/src/org/chromium/chromoting/help/HelpAndFeedbackBasic.java | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_java_tmpl.gni index fe327e3..b2d9aca 100644 --- a/remoting/android/client_java_tmpl.gni +++ b/remoting/android/client_java_tmpl.gni @@ -36,7 +36,7 @@ template("remoting_android_client_java_tmpl") { "//remoting/android/java/src/org/chromium/chromoting/DesktopView.java", "//remoting/android/java/src/org/chromium/chromoting/DummyActivityLifecycleListener.java", "//remoting/android/java/src/org/chromium/chromoting/DummyClientExtension.java", - "//remoting/android/java/src/org/chromium/chromoting/HelpActivity.java", + "//remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java", "//remoting/android/java/src/org/chromium/chromoting/help/HelpAndFeedbackBasic.java", "//remoting/android/java/src/org/chromium/chromoting/help/HelpAndFeedback.java", "//remoting/android/java/src/org/chromium/chromoting/help/HelpContext.java", diff --git a/remoting/android/java/AndroidManifest.xml.jinja2 b/remoting/android/java/AndroidManifest.xml.jinja2 index 690b66b..d330d6c 100644 --- a/remoting/android/java/AndroidManifest.xml.jinja2 +++ b/remoting/android/java/AndroidManifest.xml.jinja2 @@ -57,7 +57,7 @@ </intent-filter> </activity> {% endif %} - <activity android:name="org.chromium.chromoting.HelpActivity" + <activity android:name="org.chromium.chromoting.help.HelpActivity" android:configChanges="orientation|screenSize" android:uiOptions="splitActionBarWhenNarrow"> </activity> diff --git a/remoting/android/java/src/org/chromium/chromoting/HelpActivity.java b/remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java index 28e0696..7c79f97 100644 --- a/remoting/android/java/src/org/chromium/chromoting/HelpActivity.java +++ b/remoting/android/java/src/org/chromium/chromoting/help/HelpActivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package org.chromium.chromoting; +package org.chromium.chromoting.help; import android.app.Activity; import android.content.ComponentName; @@ -27,6 +27,7 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import org.chromium.base.Log; +import org.chromium.chromoting.R; import org.chromium.ui.UiUtils; /** diff --git a/remoting/android/java/src/org/chromium/chromoting/help/HelpAndFeedbackBasic.java b/remoting/android/java/src/org/chromium/chromoting/help/HelpAndFeedbackBasic.java index fec9f8a..010909a 100644 --- a/remoting/android/java/src/org/chromium/chromoting/help/HelpAndFeedbackBasic.java +++ b/remoting/android/java/src/org/chromium/chromoting/help/HelpAndFeedbackBasic.java @@ -6,8 +6,6 @@ package org.chromium.chromoting.help; import android.app.Activity; -import org.chromium.chromoting.HelpActivity; - /** * This class implements a basic UI for help-and-feedback. */ |