From bb869a51fde71b2e9306b65fd6b3dccb74e31e06 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 3 Sep 2014 23:32:37 -0700 Subject: [PATCH] Start using com.limelight.root package name --- AndroidManifest.xml | 2 +- gen/com/limelight/{ => root}/BuildConfig.java | 2 +- gen/com/limelight/{ => root}/R.java | 14 +++++++------- res/values/strings.xml | 2 +- src/com/limelight/AddComputerManually.java | 1 + src/com/limelight/AdvancedSettings.java | 1 + src/com/limelight/AppView.java | 1 + src/com/limelight/Game.java | 1 + src/com/limelight/PcView.java | 1 + src/com/limelight/StreamSettings.java | 1 + 10 files changed, 16 insertions(+), 10 deletions(-) rename gen/com/limelight/{ => root}/BuildConfig.java (82%) rename gen/com/limelight/{ => root}/R.java (94%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5099e633..d33fd428 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@  diff --git a/gen/com/limelight/BuildConfig.java b/gen/com/limelight/root/BuildConfig.java similarity index 82% rename from gen/com/limelight/BuildConfig.java rename to gen/com/limelight/root/BuildConfig.java index 17d1d3f8..1b357668 100644 --- a/gen/com/limelight/BuildConfig.java +++ b/gen/com/limelight/root/BuildConfig.java @@ -1,5 +1,5 @@ /** Automatically generated file. DO NOT MODIFY */ -package com.limelight; +package com.limelight.root; public final class BuildConfig { public final static boolean DEBUG = true; diff --git a/gen/com/limelight/R.java b/gen/com/limelight/root/R.java similarity index 94% rename from gen/com/limelight/R.java rename to gen/com/limelight/root/R.java index cce48566..1302db0b 100644 --- a/gen/com/limelight/R.java +++ b/gen/com/limelight/root/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package com.limelight; +package com.limelight.root; public final class R { public static final class attr { @@ -123,8 +123,8 @@ or to a theme attribute in the form "?[package:][type:]na AttributeDescription - {@link #ButtonBarContainerTheme_buttonBarButtonStyle com.limelight:buttonBarButtonStyle} - {@link #ButtonBarContainerTheme_buttonBarStyle com.limelight:buttonBarStyle} + {@link #ButtonBarContainerTheme_buttonBarButtonStyle com.limelight.root:buttonBarButtonStyle} + {@link #ButtonBarContainerTheme_buttonBarStyle com.limelight.root:buttonBarStyle} @see #ButtonBarContainerTheme_buttonBarButtonStyle @see #ButtonBarContainerTheme_buttonBarStyle @@ -133,23 +133,23 @@ or to a theme attribute in the form "?[package:][type:]na 0x7f010000, 0x7f010001 }; /** -

This symbol is the offset where the {@link com.limelight.R.attr#buttonBarButtonStyle} +

This symbol is the offset where the {@link com.limelight.root.R.attr#buttonBarButtonStyle} attribute's value can be found in the {@link #ButtonBarContainerTheme} array.

Must be a reference to another resource, in the form "@[+][package:]type:name" or to a theme attribute in the form "?[package:][type:]name". - @attr name com.limelight:buttonBarButtonStyle + @attr name com.limelight.root:buttonBarButtonStyle */ public static final int ButtonBarContainerTheme_buttonBarButtonStyle = 1; /** -

This symbol is the offset where the {@link com.limelight.R.attr#buttonBarStyle} +

This symbol is the offset where the {@link com.limelight.root.R.attr#buttonBarStyle} attribute's value can be found in the {@link #ButtonBarContainerTheme} array.

Must be a reference to another resource, in the form "@[+][package:]type:name" or to a theme attribute in the form "?[package:][type:]name". - @attr name com.limelight:buttonBarStyle + @attr name com.limelight.root:buttonBarStyle */ public static final int ButtonBarContainerTheme_buttonBarStyle = 0; }; diff --git a/res/values/strings.xml b/res/values/strings.xml index 08656313..b18f2984 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,7 +1,7 @@ - Limelight + Limelight (Root) Game diff --git a/src/com/limelight/AddComputerManually.java b/src/com/limelight/AddComputerManually.java index c4ca148d..dc14c314 100644 --- a/src/com/limelight/AddComputerManually.java +++ b/src/com/limelight/AddComputerManually.java @@ -5,6 +5,7 @@ import java.net.UnknownHostException; import java.util.concurrent.LinkedBlockingQueue; import com.limelight.computers.ComputerManagerService; +import com.limelight.root.R; import com.limelight.utils.Dialog; import android.app.Activity; diff --git a/src/com/limelight/AdvancedSettings.java b/src/com/limelight/AdvancedSettings.java index 40941ed7..4ac89788 100644 --- a/src/com/limelight/AdvancedSettings.java +++ b/src/com/limelight/AdvancedSettings.java @@ -1,5 +1,6 @@ package com.limelight; +import com.limelight.root.R; import com.limelight.utils.Dialog; import android.app.Activity; diff --git a/src/com/limelight/AppView.java b/src/com/limelight/AppView.java index e5b7d3ed..7fd4ede0 100644 --- a/src/com/limelight/AppView.java +++ b/src/com/limelight/AppView.java @@ -12,6 +12,7 @@ import com.limelight.binding.PlatformBinding; import com.limelight.nvstream.http.GfeHttpResponseException; import com.limelight.nvstream.http.NvApp; import com.limelight.nvstream.http.NvHTTP; +import com.limelight.root.R; import com.limelight.utils.Dialog; import com.limelight.utils.SpinnerDialog; diff --git a/src/com/limelight/Game.java b/src/com/limelight/Game.java index 2e9b465e..30dd1df2 100644 --- a/src/com/limelight/Game.java +++ b/src/com/limelight/Game.java @@ -14,6 +14,7 @@ import com.limelight.nvstream.StreamConfiguration; import com.limelight.nvstream.av.video.VideoDecoderRenderer; import com.limelight.nvstream.input.KeyboardPacket; import com.limelight.nvstream.input.MouseButtonPacket; +import com.limelight.root.R; import com.limelight.utils.Dialog; import com.limelight.utils.SpinnerDialog; diff --git a/src/com/limelight/PcView.java b/src/com/limelight/PcView.java index 660c22d7..87dfc98a 100644 --- a/src/com/limelight/PcView.java +++ b/src/com/limelight/PcView.java @@ -13,6 +13,7 @@ import com.limelight.nvstream.http.NvHTTP; import com.limelight.nvstream.http.PairingManager; import com.limelight.nvstream.http.PairingManager.PairState; import com.limelight.nvstream.wol.WakeOnLanSender; +import com.limelight.root.R; import com.limelight.utils.Dialog; import android.app.Activity; diff --git a/src/com/limelight/StreamSettings.java b/src/com/limelight/StreamSettings.java index 9bd0d06c..f272106c 100644 --- a/src/com/limelight/StreamSettings.java +++ b/src/com/limelight/StreamSettings.java @@ -1,5 +1,6 @@ package com.limelight; +import com.limelight.root.R; import com.limelight.utils.Dialog; import android.os.Bundle;