Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9db47982 authored by Jochen Sprickerhof's avatar Jochen Sprickerhof Committed by Gitsaibot
Browse files

Use buildType in CalendarRecentSuggestionsProvider 

Allows installing build and debug builds in parallel.
parent 01b6781f

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ 


        <provider android:name="com.android.calendar.CalendarRecentSuggestionsProvider"

            android:exported="false"

            android:authorities="ws.xsoh.etar.CalendarRecentSuggestionsProvider" />

            android:authorities="${applicationId}.CalendarRecentSuggestionsProvider" />



        <!-- Declarations for alerts/reminders -->

        <activity

build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -192,12 +192,14 @@ android { 
        release {

            // TODO: could be enabled for ProGuard minimization

            minifyEnabled false

            resValue "string", "search_authority", defaultConfig.applicationId + '.CalendarRecentSuggestionsProvider'

        }



        debug {

            minifyEnabled false



            applicationIdSuffix ".debug"

            resValue "string", "search_authority", defaultConfig.applicationId + '.debug.CalendarRecentSuggestionsProvider'

        }

    }

res/xml/searchable.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:voiceSearchMode="showVoiceSearchButton|launchRecognizer"

    android:voiceLanguageModel="free_form"



    android:searchSuggestAuthority="ws.xsoh.etar.CalendarRecentSuggestionsProvider"

    android:searchSuggestAuthority="@string/search_authority"

    android:searchSuggestSelection=" ? "

    android:imeOptions="actionSearch" >

</searchable>

src/com/android/calendar/Utils.java

+2 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import java.util.TimeZone; 
import java.util.regex.Matcher;

import java.util.regex.Pattern;



import ws.xsoh.etar.BuildConfig;

import ws.xsoh.etar.R;



import static android.provider.CalendarContract.EXTRA_EVENT_BEGIN_TIME;
@@ -257,7 +258,7 @@ public class Utils { 
     * Gets the intent action for telling the widget to update.

     */

    public static String getSearchAuthority(Context context) {

        return "ws.xsoh.etar.CalendarRecentSuggestionsProvider";

        return BuildConfig.APPLICATION_ID + ".CalendarRecentSuggestionsProvider";

    }



    /**