Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matthew Finkel
fenix
Commits
4056b180
Commit
4056b180
authored
Jul 31, 2020
by
Matthew Finkel
Browse files
Bug 40020: Change applicationId
parent
f387a690
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/build.gradle
View file @
4056b180
...
...
@@ -20,7 +20,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
android
{
compileSdkVersion
Config
.
compileSdkVersion
defaultConfig
{
applicationId
"org.
mozilla
"
applicationId
"org.
torproject
"
minSdkVersion
Config
.
minSdkVersion
targetSdkVersion
Config
.
targetSdkVersion
versionCode
1
...
...
@@ -57,12 +57,12 @@ android {
debug
{
shrinkResources
false
minifyEnabled
false
applicationIdSuffix
".
fenix.
debug"
applicationIdSuffix
".
torbrowser_
debug"
resValue
"bool"
,
"IS_DEBUG"
,
"true"
pseudoLocalesEnabled
true
}
nightly
releaseTemplate
>>
{
applicationIdSuffix
".
fenix
"
applicationIdSuffix
".
torbrowser_nightly
"
buildConfigField
"boolean"
,
"USE_RELEASE_VERSIONING"
,
"true"
def
deepLinkSchemeValue
=
"fenix-nightly"
buildConfigField
"String"
,
"DEEP_LINK_SCHEME"
,
"\"$deepLinkSchemeValue\""
...
...
@@ -70,7 +70,7 @@ android {
}
beta
releaseTemplate
>>
{
buildConfigField
"boolean"
,
"USE_RELEASE_VERSIONING"
,
"true"
applicationIdSuffix
".
firefox_bet
a"
applicationIdSuffix
".
torbrowser_alph
a"
def
deepLinkSchemeValue
=
"fenix-beta"
buildConfigField
"String"
,
"DEEP_LINK_SCHEME"
,
"\"$deepLinkSchemeValue\""
manifestPlaceholders
=
[
...
...
@@ -81,13 +81,13 @@ android {
// fatal consequences. For example see:
// - https://issuetracker.google.com/issues/36924841
// - https://issuetracker.google.com/issues/36905922
"sharedUserId"
:
"org.
mozilla.firefox
.sharedID"
,
"sharedUserId"
:
"org.
torproject.torbrowser_alpha
.sharedID"
,
"deepLinkScheme"
:
deepLinkSchemeValue
]
}
release
releaseTemplate
>>
{
buildConfigField
"boolean"
,
"USE_RELEASE_VERSIONING"
,
"true"
applicationIdSuffix
".
firefox
"
applicationIdSuffix
".
torbrowser
"
def
deepLinkSchemeValue
=
"fenix"
buildConfigField
"String"
,
"DEEP_LINK_SCHEME"
,
"\"$deepLinkSchemeValue\""
manifestPlaceholders
=
[
...
...
@@ -98,7 +98,7 @@ android {
// fatal consequences. For example see:
// - https://issuetracker.google.com/issues/36924841
// - https://issuetracker.google.com/issues/36905922
"sharedUserId"
:
"org.
mozilla.firefox
.sharedID"
,
"sharedUserId"
:
"org.
torproject.torbrowser
.sharedID"
,
"deepLinkScheme"
:
deepLinkSchemeValue
]
}
...
...
app/src/beta/res/xml/shortcuts.xml
View file @
4056b180
...
...
@@ -11,7 +11,7 @@
android:shortcutLongLabel=
"@string/home_screen_shortcut_open_new_tab_2"
>
<intent
android:action=
"org.mozilla.fenix.OPEN_TAB"
android:targetPackage=
"org.
mozilla.firefox_bet
a"
android:targetPackage=
"org.
torproject.torbrowser_alph
a"
android:targetClass=
"org.mozilla.fenix.IntentReceiverActivity"
/>
</shortcut>
<shortcut
...
...
@@ -22,7 +22,7 @@
android:shortcutLongLabel=
"@string/home_screen_shortcut_open_new_private_tab_2"
>
<intent
android:action=
"org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage=
"org.
mozilla.firefox_bet
a"
android:targetPackage=
"org.
torproject.torbrowser_alph
a"
android:targetClass=
"org.mozilla.fenix.IntentReceiverActivity"
/>
</shortcut>
</shortcuts>
app/src/debug/res/xml/shortcuts.xml
View file @
4056b180
...
...
@@ -12,7 +12,7 @@
android:shortcutLongLabel=
"@string/home_screen_shortcut_open_new_tab_2"
>
<intent
android:action=
"org.mozilla.fenix.OPEN_TAB"
android:targetPackage=
"org.
mozilla.fenix.
debug"
android:targetPackage=
"org.
torproject.torbrowser_
debug"
android:targetClass=
"org.mozilla.fenix.IntentReceiverActivity"
/>
</shortcut>
<shortcut
...
...
@@ -23,7 +23,7 @@
android:shortcutLongLabel=
"@string/home_screen_shortcut_open_new_private_tab_2"
>
<intent
android:action=
"org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage=
"org.
mozilla.fenix.
debug"
android:targetPackage=
"org.
torproject.torbrowser_
debug"
android:targetClass=
"org.mozilla.fenix.IntentReceiverActivity"
/>
</shortcut>
</shortcuts>
\ No newline at end of file
app/src/main/res/xml/shortcuts.xml
View file @
4056b180
...
...
@@ -12,7 +12,7 @@
android:shortcutLongLabel=
"@string/home_screen_shortcut_open_new_tab_2"
>
<intent
android:action=
"org.mozilla.fenix.OPEN_TAB"
android:targetPackage=
"org.
mozilla.fenix
"
android:targetPackage=
"org.
torproject.torbrowser_dev
"
android:targetClass=
"org.mozilla.fenix.IntentReceiverActivity"
/>
</shortcut>
<shortcut
...
...
@@ -23,7 +23,7 @@
android:shortcutLongLabel=
"@string/home_screen_shortcut_open_new_private_tab_2"
>
<intent
android:action=
"org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage=
"org.
mozilla.fenix
"
android:targetPackage=
"org.
torproject.torbrowser_dev
"
android:targetClass=
"org.mozilla.fenix.IntentReceiverActivity"
/>
</shortcut>
</shortcuts>
\ No newline at end of file
app/src/nightly/res/xml/shortcuts.xml
View file @
4056b180
...
...
@@ -12,7 +12,7 @@
android:shortcutLongLabel=
"@string/home_screen_shortcut_open_new_tab_2"
>
<intent
android:action=
"org.mozilla.fenix.OPEN_TAB"
android:targetPackage=
"org.
mozilla.fenix
"
android:targetPackage=
"org.
torproject.torbrowser_nightly
"
android:targetClass=
"org.mozilla.fenix.IntentReceiverActivity"
/>
</shortcut>
<shortcut
...
...
@@ -23,7 +23,7 @@
android:shortcutLongLabel=
"@string/home_screen_shortcut_open_new_private_tab_2"
>
<intent
android:action=
"org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage=
"org.
mozilla.fenix
"
android:targetPackage=
"org.
torproject.torbrowser_nightly
"
android:targetClass=
"org.mozilla.fenix.IntentReceiverActivity"
/>
</shortcut>
</shortcuts>
</shortcuts>
\ No newline at end of file
app/src/release/res/xml/shortcuts.xml
View file @
4056b180
...
...
@@ -11,7 +11,7 @@
android:shortcutLongLabel=
"@string/home_screen_shortcut_open_new_tab_2"
>
<intent
android:action=
"org.mozilla.fenix.OPEN_TAB"
android:targetPackage=
"org.
mozilla.firefox
"
android:targetPackage=
"org.
torproject.torbrowser
"
android:targetClass=
"org.mozilla.fenix.IntentReceiverActivity"
/>
</shortcut>
<shortcut
...
...
@@ -22,7 +22,7 @@
android:shortcutLongLabel=
"@string/home_screen_shortcut_open_new_private_tab_2"
>
<intent
android:action=
"org.mozilla.fenix.OPEN_PRIVATE_TAB"
android:targetPackage=
"org.
mozilla.firefox
"
android:targetPackage=
"org.
torproject.torbrowser
"
android:targetClass=
"org.mozilla.fenix.IntentReceiverActivity"
/>
</shortcut>
</shortcuts>
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment