Bug 920170 - Move Android prompt service components to their own namespace. r=margaret

--HG--
rename : mobile/android/base/Prompt.java => mobile/android/base/prompts/Prompt.java
rename : mobile/android/base/PromptInput.java => mobile/android/base/prompts/PromptInput.java
rename : mobile/android/base/PromptService.java => mobile/android/base/prompts/PromptService.java
This commit is contained in:
Wes Johnston 2013-10-02 11:18:16 -07:00
parent 05e11fc7cf
commit 3ebb9492d4
11 changed files with 22 additions and 8 deletions

View File

@ -4,6 +4,8 @@
package org.mozilla.gecko;
import org.mozilla.gecko.prompts.Prompt;
import org.mozilla.gecko.prompts.PromptService;
import org.mozilla.gecko.util.ActivityResultHandler;
import org.mozilla.gecko.util.ActivityResultHandlerMap;
import org.mozilla.gecko.util.ThreadUtils;

View File

@ -7,6 +7,7 @@ package org.mozilla.gecko;
import org.mozilla.gecko.util.HardwareUtils;
import org.mozilla.gecko.util.ThreadUtils;
import org.mozilla.gecko.prompts.PromptService;
import android.app.Activity;
import android.content.Context;

View File

@ -20,6 +20,7 @@ import org.mozilla.gecko.home.BrowserSearch;
import org.mozilla.gecko.home.HomePager;
import org.mozilla.gecko.home.HomePager.OnUrlOpenListener;
import org.mozilla.gecko.menu.GeckoMenu;
import org.mozilla.gecko.prompts.Prompt;
import org.mozilla.gecko.util.Clipboard;
import org.mozilla.gecko.util.GamepadUtils;
import org.mozilla.gecko.util.HardwareUtils;

View File

@ -6,6 +6,7 @@
package org.mozilla.gecko;
import org.mozilla.gecko.widget.Divider;
import org.mozilla.gecko.prompts.PromptInput;
import org.json.JSONArray;
import org.json.JSONException;

View File

@ -7,6 +7,7 @@ package org.mozilla.gecko;
import org.mozilla.gecko.util.GeckoEventListener;
import org.mozilla.gecko.widget.ArrowPopup;
import org.mozilla.gecko.prompts.PromptInput;
import org.json.JSONArray;
import org.json.JSONException;

View File

@ -12,6 +12,7 @@ import org.mozilla.gecko.gfx.BitmapUtils;
import org.mozilla.gecko.gfx.Layer;
import org.mozilla.gecko.gfx.LayerView;
import org.mozilla.gecko.gfx.PluginLayer;
import org.mozilla.gecko.prompts.PromptService;
import org.mozilla.gecko.menu.GeckoMenu;
import org.mozilla.gecko.menu.GeckoMenuInflater;
import org.mozilla.gecko.menu.MenuPanel;

View File

@ -10,6 +10,7 @@ import org.mozilla.gecko.gfx.GeckoLayerClient;
import org.mozilla.gecko.gfx.GfxInfoThread;
import org.mozilla.gecko.gfx.LayerView;
import org.mozilla.gecko.gfx.PanZoomController;
import org.mozilla.gecko.prompts.PromptService;
import org.mozilla.gecko.mozglue.GeckoLoader;
import org.mozilla.gecko.mozglue.GeneratableAndroidBridgeTarget;
import org.mozilla.gecko.mozglue.OptionalGeneratedParameter;

View File

@ -126,9 +126,9 @@ FENNEC_JAVA_FILES = \
PrefsHelper.java \
PrivateDataPreference.java \
PrivateTab.java \
Prompt.java \
PromptInput.java \
PromptService.java \
prompts/Prompt.java \
prompts/PromptInput.java \
prompts/PromptService.java \
Restarter.java \
sqlite/ByteBufferInputStream.java \
sqlite/MatrixBlobCursor.java \

View File

@ -3,11 +3,14 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko;
package org.mozilla.gecko.prompts;
import org.mozilla.gecko.util.GeckoEventResponder;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.util.ThreadUtils;
import org.mozilla.gecko.widget.DateTimePicker;
import org.mozilla.gecko.R;
import org.mozilla.gecko.GeckoAppShell;
import org.json.JSONArray;
import org.json.JSONObject;

View File

@ -3,8 +3,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko;
package org.mozilla.gecko.prompts;
import org.mozilla.gecko.AllCapsTextView;
import org.mozilla.gecko.util.GeckoEventResponder;
import org.mozilla.gecko.util.ThreadUtils;
import org.mozilla.gecko.widget.DateTimePicker;
@ -40,7 +41,7 @@ import java.util.GregorianCalendar;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.TimeUnit;
class PromptInput {
public class PromptInput {
private final JSONObject mJSONInput;
protected final String mLabel;

View File

@ -3,8 +3,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko;
package org.mozilla.gecko.prompts;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.util.GeckoEventResponder;
import org.mozilla.gecko.util.ThreadUtils;
@ -27,7 +29,7 @@ public class PromptService implements GeckoEventResponder {
mContext = context;
}
void destroy() {
public void destroy() {
GeckoAppShell.getEventDispatcher().unregisterEventListener("Prompt:Show", this);
GeckoAppShell.getEventDispatcher().unregisterEventListener("Prompt:ShowTop", this);
}