Commit c4bf52fd authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Bug 40020: Change applicationId

parent 65ee32ec
Loading
Loading
Loading
Loading
+7 −7
Changes for app/build.gradle: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -21,7 +21,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
@@ -58,12 +58,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\""
@@ -71,7 +71,7 @@ android {
        }
        beta releaseTemplate >> {
            buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"
            applicationIdSuffix ".firefox_beta"
            applicationIdSuffix ".torbrowser_alpha"
            def deepLinkSchemeValue = "fenix-beta"
            buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""
            manifestPlaceholders = [
@@ -82,13 +82,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 = [
@@ -99,7 +99,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
            ]
        }
+2 −2
Changes for app/src/beta/res/xml/shortcuts.xml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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_beta"
            android:targetPackage="org.torproject.torbrowser_alpha"
            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_beta"
            android:targetPackage="org.torproject.torbrowser_alpha"
            android:targetClass="org.mozilla.fenix.IntentReceiverActivity" />
    </shortcut>
</shortcuts>
+2 −2
Changes for app/src/debug/res/xml/shortcuts.xml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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
+2 −2
Changes for app/src/main/res/xml/shortcuts.xml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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
+2 −2
Changes for app/src/nightly/res/xml/shortcuts.xml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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>
 No newline at end of file
Loading